diff options
551 files changed, 12759 insertions, 5901 deletions
diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index c6e1c1da6942d..74e4fa9ba4eb2 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -111,3 +111,6 @@ fb0e5be84331188a69b3edd31679ca6576edb75a # pkgs/os-specific/bsd: Reformat with nixfmt-rfc-style 2024-03-01 3fe3b055adfc020e6a923c466b6bcd978a13069a + +# k3s: format with nixfmt-rfc-style +0b7900d5e8e0bcac89e14a52d3e840f9201e9f47 diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 3d45e69971b15..47d5d399f1983 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -137,9 +137,9 @@ 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 @@ -345,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/.github/workflows/check-nix-format.yml b/.github/workflows/check-nix-format.yml index 87fe5d5464f0a..1d51c973be937 100644 --- a/.github/workflows/check-nix-format.yml +++ b/.github/workflows/check-nix-format.yml @@ -39,6 +39,10 @@ jobs: 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 diff --git a/lib/systems/default.nix b/lib/systems/default.nix index 7e9aadeef72e5..fbd6c323bf425 100644 --- a/lib/systems/default.nix +++ b/lib/systems/default.nix @@ -81,6 +81,8 @@ let && final.parsed.kernel == platform.parsed.kernel; isCompatible = _: throw "2022-05-23: isCompatible has been removed in favor of canExecute, refer to the 22.11 changelog for details"; # Derived meta-data + useLLVM = final.isFreeBSD; + libc = /**/ if final.isDarwin then "libSystem" else if final.isMinGW then "msvcrt" diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 824866dd397a2..99c182b8340e0 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1962,7 +1962,7 @@ }; atry = { name = "Bo Yang"; - email = "atry@fb.com"; + email = "yang-bo@yang-bo.com"; github = "Atry"; githubId = 601530; }; @@ -5919,6 +5919,12 @@ githubId = 1365692; name = "Will Fancher"; }; + elysasrc = { + name = "Elysa"; + github = "ElysaSrc"; + githubId = 101974839; + email = "elysasrc@proton.me"; + }; emantor = { email = "rouven+nixos@czerwinskis.de"; github = "Emantor"; @@ -13814,6 +13820,12 @@ githubId = 133448; name = "Mikołaj Siedlarek"; }; + msladecek = { + email = "martin.sladecek+nixpkgs@gmail.com"; + name = "Martin Sladecek"; + github = "msladecek"; + githubId = 7304317; + }; mslingsby = { email = "morten.slingsby@eviny.no"; github = "MortenSlingsby"; @@ -15441,6 +15453,12 @@ githubId = 72527881; name = "PassiveLemon"; }; + pathob = { + email = "patrick@hobusch.net"; + github = "pathob"; + githubId = 4580157; + name = "Patrick Hobusch"; + }; patka = { email = "patka@patka.dev"; github = "patka-123"; @@ -17807,6 +17825,12 @@ fingerprint = "E628 C811 6FB8 1657 F706 4EA4 F251 ADDC 9D04 1C7E"; }]; }; + sailord = { + name = "Sailord"; + email = "sailord328@gmail.com"; + github = "Sail0rd"; + githubId = 55802415; + }; samalws = { email = "sam@samalws.com"; name = "Sam Alws"; @@ -20680,6 +20704,11 @@ githubId = 9870613; name = "Hubert Mühlhans"; }; + trishtzy = { + github = "trishtzy"; + githubId = 5356506; + name = "Tricia Tan"; + }; trobert = { email = "thibaut.robert@gmail.com"; github = "trobert"; @@ -21880,6 +21909,12 @@ github = "wr0belj"; githubId = 40501814; }; + wr7 = { + name = "wr7"; + email = "d-wr7@outlook.com"; + github = "wr7"; + githubId = 53203261; + }; wraithm = { name = "Matthew Wraith"; email = "wraithm@gmail.com"; @@ -22109,6 +22144,12 @@ githubId = 2242427; name = "Yoann Ono"; }; + yah = { + email = "yah@singularpoint.cc"; + github = "wangxiaoerYah"; + githubId = 48443038; + name = "Yah"; + }; yajo = { email = "yajo.sk8@gmail.com"; github = "yajo"; diff --git a/maintainers/scripts/kde/collect-missing-deps.py b/maintainers/scripts/kde/collect-missing-deps.py index f3943338b57fb..9625da71c3e51 100755 --- a/maintainers/scripts/kde/collect-missing-deps.py +++ b/maintainers/scripts/kde/collect-missing-deps.py @@ -28,6 +28,7 @@ OK_MISSING_BY_PACKAGE = { "discover": { "rpm-ostree-1", # we don't have rpm-ostree (duh) "Snapd", # we don't have snaps and probably never will + "packagekitqt6", # intentionally disabled }, "elisa": { "UPNPQT", # upstream says it's broken @@ -36,6 +37,9 @@ OK_MISSING_BY_PACKAGE = { "Sphinx", # only used for docs, bloats closure size "QCollectionGenerator" }, + "gwenview": { + "Tiff", # duplicate? + }, "kio-extras-kf5": { "KDSoapWSDiscoveryClient", # actually vendored on KF5 version }, diff --git a/nixos/doc/manual/release-notes/rl-2405.section.md b/nixos/doc/manual/release-notes/rl-2405.section.md index 4058f4e504418..be087d2e88723 100644 --- a/nixos/doc/manual/release-notes/rl-2405.section.md +++ b/nixos/doc/manual/release-notes/rl-2405.section.md @@ -16,7 +16,7 @@ In addition to numerous new and upgraded packages, this release has the followin - `linuxPackages_testing_bcachefs` is now fully deprecated by `linuxPackages_latest`, and is therefore no longer available. -- (TODO not sure what path to use here) The default kernel package has been updated from 6.1 to 6.6. All supported kernels remain available. +- The default kernel package has been updated from 6.1 to 6.6. All supported kernels remain available. - NixOS now installs a stub ELF loader that prints an informative error message when users attempt to run binaries not made for NixOS. - This can be disabled through the `environment.stub-ld.enable` option. @@ -98,13 +98,13 @@ Use `services.pipewire.extraConfig` or `services.pipewire.configPackages` for Pi - [clatd](https://github.com/toreanderson/clatd), a CLAT / SIIT-DC Edge Relay implementation for Linux. -- [pyLoad](https://pyload.net/), a FOSS download manager written in Python. Available as [services.pyload](#opt-services.pyload.enable) +- [pyLoad](https://pyload.net/), a FOSS download manager written in Python. Available as [services.pyload](#opt-services.pyload.enable). - [maubot](https://github.com/maubot/maubot), a plugin-based Matrix bot framework. Available as [services.maubot](#opt-services.maubot.enable). -- [ryzen-monitor-ng](https://github.com/mann1x/ryzen_monitor_ng), a desktop AMD CPU power monitor and controller, similar to Ryzen Master but for Linux. Available as [programs.ryzen-monitor-ng](#opt-programs.ryzen-monitor-ng.enable) +- [ryzen-monitor-ng](https://github.com/mann1x/ryzen_monitor_ng), a desktop AMD CPU power monitor and controller, similar to Ryzen Master but for Linux. Available as [programs.ryzen-monitor-ng](#opt-programs.ryzen-monitor-ng.enable). -- [ryzen-smu](https://gitlab.com/leogx9r/ryzen_smu), Linux kernel driver to expose the SMU (System Management Unit) for certain AMD Ryzen Processors. Includes the userspace program `monitor_cpu`. Available at [hardward.cpu.amd.ryzen-smu](#opt-hardware.cpu.amd.ryzen-smu.enable) +- [ryzen-smu](https://gitlab.com/leogx9r/ryzen_smu), Linux kernel driver to expose the SMU (System Management Unit) for certain AMD Ryzen Processors. Includes the userspace program `monitor_cpu`. Available at [hardward.cpu.amd.ryzen-smu](#opt-hardware.cpu.amd.ryzen-smu.enable). - `systemd`'s `gateway`, `upload`, and `remote` services, which provide ways of sending journals across the network. Enable using [services.journald.gateway](#opt-services.journald.gateway.enable), [services.journald.upload](#opt-services.journald.upload.enable), and [services.journald.remote](#opt-services.journald.remote.enable). @@ -128,7 +128,7 @@ Use `services.pipewire.extraConfig` or `services.pipewire.configPackages` for Pi - [Python Matter Server](https://github.com/home-assistant-libs/python-matter-server), a Matter Controller Server exposing websocket connections for use with other services, notably Home Assistant. - Available as [services.matter-server](#opt-services.matter-server.enable) + Available as [services.matter-server](#opt-services.matter-server.enable). - [db-rest](https://github.com/derhuerst/db-rest), a wrapper around Deutsche Bahn's internal API for public transport data. Available as [services.db-rest](#opt-services.db-rest.enable). @@ -137,7 +137,7 @@ Use `services.pipewire.extraConfig` or `services.pipewire.configPackages` for Pi - [Anki Sync Server](https://docs.ankiweb.net/sync-server.html), the official sync server built into recent versions of Anki. Available as [services.anki-sync-server](#opt-services.anki-sync-server.enable). The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been marked deprecated and will be dropped after 24.05 due to lack of maintenance of the anki-sync-server software. -- [mautrix-meta](https://github.com/mautrix/meta), a Matrix <-> Facebook and Matrix <-> Instagram hybrid puppeting/relaybot bridge. Available as services.mautrix-meta +- [mautrix-meta](https://github.com/mautrix/meta), a Matrix <-> Facebook and Matrix <-> Instagram hybrid puppeting/relaybot bridge. Available as services.mautrix-meta. - [Jottacloud Command-line Tool](https://docs.jottacloud.com/en/articles/1436834-jottacloud-command-line-tool), a CLI for the [Jottacloud](https://jottacloud.com/) cloud storage provider. Available as [services.jotta-cli](#opt-services.jotta-cli.enable). @@ -161,7 +161,7 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m - [Monado](https://monado.freedesktop.org/), an open source XR runtime. Available as [services.monado](#opt-services.monado.enable). -- [intel-gpu-tools](https://drm.pages.freedesktop.org/igt-gpu-tools), tools for development and testing of the Intel DRM driver. Available as [hardware.intel-gpu-tools](#opt-hardware.intel-gpu-tools.enable) +- [intel-gpu-tools](https://drm.pages.freedesktop.org/igt-gpu-tools), tools for development and testing of the Intel DRM driver. Available as [hardware.intel-gpu-tools](#opt-hardware.intel-gpu-tools.enable). - [Pretix](https://pretix.eu/about/en/), an open source ticketing software for events. Available as [services.pretix](#opt-services.pretix.enable). @@ -183,7 +183,7 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m - [nh](https://github.com/viperML/nh), yet another Nix CLI helper. Available as [programs.nh](#opt-programs.nh.enable). -- [ALVR](https://github.com/alvr-org/alvr), a VR desktop streamer. Available as [programs.alvr](#opt-programs.alvr.enable) +- [ALVR](https://github.com/alvr-org/alvr), a VR desktop streamer. Available as [programs.alvr](#opt-programs.alvr.enable). - [xdg-terminal-exec](https://github.com/Vladimir-csp/xdg-terminal-exec), the proposed Default Terminal Execution Specification. @@ -193,22 +193,24 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m - [davis](https://github.com/tchapi/davis), a simple CardDav and CalDav server inspired by Baïkal. Available as [services.davis](#opt-services.davis.enable). -- [Firefly-iii](https://www.firefly-iii.org), a free and open source personal finance manager. Available as [services.firefly-iii](#opt-services.firefly-iii.enable) +- [Firefly-iii](https://www.firefly-iii.org), a free and open source personal finance manager. Available as [services.firefly-iii](#opt-services.firefly-iii.enable). - [systemd-lock-handler](https://git.sr.ht/~whynothugo/systemd-lock-handler/), a bridge between logind D-Bus events and systemd targets. Available as [services.systemd-lock-handler.enable](#opt-services.systemd-lock-handler.enable). - [wastebin](https://github.com/matze/wastebin), a pastebin server written in rust. Available as [services.wastebin](#opt-services.wastebin.enable). -- [Mealie](https://nightly.mealie.io/), a self-hosted recipe manager and meal planner with a RestAPI backend and a reactive frontend application built in NuxtJS for a pleasant user experience for the whole family. Available as [services.mealie](#opt-services.mealie.enable) +- [Mealie](https://nightly.mealie.io/), a self-hosted recipe manager and meal planner with a RestAPI backend and a reactive frontend application built in NuxtJS for a pleasant user experience for the whole family. Available as [services.mealie](#opt-services.mealie.enable). - [Sunshine](https://app.lizardbyte.dev/Sunshine), a self-hosted game stream host for Moonlight. Available as [services.sunshine](#opt-services.sunshine.enable). -- [Uni-Sync](https://github.com/EightB1ts/uni-sync), a synchronization tool for Lian Li Uni Controllers. Available as [hardware.uni-sync](#opt-hardware.uni-sync.enable) +- [Uni-Sync](https://github.com/EightB1ts/uni-sync), a synchronization tool for Lian Li Uni Controllers. Available as [hardware.uni-sync](#opt-hardware.uni-sync.enable). - [prometheus-nats-exporter](https://github.com/nats-io/prometheus-nats-exporter), a Prometheus exporter for NATS. Available as [services.prometheus.exporters.nats](#opt-services.prometheus.exporters.nats.enable). - [isolate](https://github.com/ioi/isolate), a sandbox for securely executing untrusted programs. Available as [security.isolate](#opt-security.isolate.enable). +- [private-gpt](https://github.com/zylon-ai/private-gpt), a service to interact with your documents using the power of LLMs, 100% privately, no data leaks. Available as [services.private-gpt](#opt-services.private-gpt.enable). + ## Backward Incompatibilities {#sec-release-24.05-incompatibilities} <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. --> @@ -267,7 +269,7 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m - `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 version 5. You may want to read the [release notes for Neo4j 5](https://neo4j.com/release-notes/database/neo4j-5/). @@ -297,7 +299,7 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m - `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. -- `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) +- `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. @@ -459,6 +461,11 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m - `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 @@ -467,11 +474,11 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m - `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`. @@ -532,7 +539,7 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m - `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. -- (TODO awaiting feedback on code-casing package names) 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. @@ -568,7 +575,7 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m The `nimPackages` and `nim2Packages` sets have been removed. See https://nixos.org/manual/nixpkgs/unstable#nim for more information. -- [TODO: reword to place an attribute at the front] 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. @@ -584,7 +591,7 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m - `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. -- [TODO: reword to place an attribute at the front] The EC2 image module now enables the [Amazon SSM Agent](https://docs.aws.amazon.com/systems-manager/latest/userguide/ssm-agent.html) by default. +- The EC2 image module now enables the [Amazon SSM Agent](https://docs.aws.amazon.com/systems-manager/latest/userguide/ssm-agent.html) by default. - The following options of the Nextcloud module were moved into [`services.nextcloud.settings`](#opt-services.nextcloud.settings) and renamed to match the name from Nextcloud's `config.php`: - `logLevel` -> [`loglevel`](#opt-services.nextcloud.settings.loglevel), @@ -619,7 +626,7 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m - `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). -- [TODO: reword to place an attribute at the front] 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. @@ -637,7 +644,7 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m - [](#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. -- [TODO: reword to place an attribute at the front] 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. @@ -693,16 +700,16 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m - `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. -- QtMultimedia has changed its default backend to `QT_MEDIA_BACKEND=ffmpeg` (previously `gstreamer` on Linux or `darwin` on MacOS). +- `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. - `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. -- [TODO: reword to place an attribute at the front] 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. -- `grafana-loki` package was updated to 3.0.0 which includes [breaking changes](https://github.com/grafana/loki/releases/tag/v3.0.0) +- `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 +- `programs.fish.package` now allows you to override the package used in the `fish` module. diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 76ccf5a341094..3cbb4617517aa 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -776,6 +776,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 diff --git a/nixos/modules/services/audio/navidrome.nix b/nixos/modules/services/audio/navidrome.nix index a5a7e805e3d61..ca1cd6ca43af0 100644 --- a/nixos/modules/services/audio/navidrome.nix +++ b/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 <https://www.navidrome.org/docs/usage/configuration-options/> for supported values. - ''; + description = "Configuration for Navidrome, see <https://www.navidrome.org/docs/usage/configuration-options/> 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]; + 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; + }; + }; + }; - 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; + 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/nixos/modules/services/cluster/k3s/default.nix b/nixos/modules/services/cluster/k3s/default.nix index 040cf7640de16..4d18d378d7944 100644 --- a/nixos/modules/services/cluster/k3s/default.nix +++ b/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/nixos/modules/services/misc/private-gpt.nix b/nixos/modules/services/misc/private-gpt.nix new file mode 100644 index 0000000000000..9a3e5317cdb14 --- /dev/null +++ b/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/nixos/modules/services/networking/pixiecore.nix b/nixos/modules/services/networking/pixiecore.nix index cfdb8014136ed..111cb7e355040 100644 --- a/nixos/modules/services/networking/pixiecore.nix +++ b/nixos/modules/services/networking/pixiecore.nix @@ -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/nixos/modules/services/web-apps/pretalx.nix b/nixos/modules/services/web-apps/pretalx.nix index b062a8b7eeeac..d0b1512f77c59 100644 --- a/nixos/modules/services/web-apps/pretalx.nix +++ b/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 = { @@ -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/nixos/modules/services/web-apps/pretix.nix b/nixos/modules/services/web-apps/pretix.nix index 22ee9769aa923..498face7456db 100644 --- a/nixos/modules/services/web-apps/pretix.nix +++ b/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/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix index 08fab09e1e559..fd940cfe459ab 100644 --- a/nixos/modules/services/web-servers/nginx/default.nix +++ b/nixos/modules/services/web-servers/nginx/default.nix @@ -352,7 +352,7 @@ 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 - acmeName = if vhost.useACMEHost != null then vhost.useACMEHost else vhostName; + 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 diff --git a/nixos/modules/testing/test-instrumentation.nix b/nixos/modules/testing/test-instrumentation.nix index dd8816063c70c..2b365bc555855 100644 --- a/nixos/modules/testing/test-instrumentation.nix +++ b/nixos/modules/testing/test-instrumentation.nix @@ -218,7 +218,7 @@ in services.displayManager.logToJournal = true; - services.logrotate.enable = lib.mkDefault false; + 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. diff --git a/nixos/tests/acme.nix b/nixos/tests/acme.nix index d63a77fcdd23c..511d3c589faef 100644 --- a/nixos/tests/acme.nix +++ b/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/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index ba876fe31fc04..f9e81f2bbd8d6 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -424,7 +424,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 {}; @@ -756,6 +757,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 {}; diff --git a/nixos/tests/firefox.nix b/nixos/tests/firefox.nix index fbea95dc75235..1915761b96056 100644 --- a/nixos/tests/firefox.nix +++ b/nixos/tests/firefox.nix @@ -1,4 +1,4 @@ -import ./make-test-python.nix ({ pkgs, firefoxPackage, ... }: +import ./make-test-python.nix ({ lib, pkgs, firefoxPackage, ... }: { name = firefoxPackage.pname; @@ -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/nixos/tests/incus/container.nix b/nixos/tests/incus/container.nix index f6bc295448e28..10262cf2132b8 100644 --- a/nixos/tests/incus/container.nix +++ b/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; }; diff --git a/nixos/tests/incus/default.nix b/nixos/tests/incus/default.nix index d778928a3b9f5..c33bf1600f27a 100644 --- a/nixos/tests/incus/default.nix +++ b/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; }; }; - incusd-options = import ./incusd-options.nix { inherit system pkgs; }; - lxd-to-incus = import ./lxd-to-incus.nix { inherit system pkgs; }; - openvswitch = import ./openvswitch.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/nixos/tests/incus/incusd-options.nix b/nixos/tests/incus/incusd-options.nix index b1e7f497fe3e7..7b3a4d726e38e 100644 --- a/nixos/tests/incus/incusd-options.nix +++ b/nixos/tests/incus/incusd-options.nix @@ -1,7 +1,12 @@ # 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, ... }: + { + pkgs, + lib, + incus ? pkgs.incus-lts, + ... + }: let releases = import ../../release.nix { @@ -29,6 +34,7 @@ import ../make-test-python.nix ( incus = { enable = true; + package = incus; softDaemonRestart = false; preseed = { diff --git a/nixos/tests/incus/lxd-to-incus.nix b/nixos/tests/incus/lxd-to-incus.nix index e93b76591eca4..66f78cbd33b40 100644 --- a/nixos/tests/incus/lxd-to-incus.nix +++ b/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/nixos/tests/incus/openvswitch.nix b/nixos/tests/incus/openvswitch.nix index 5d4aef031ad0a..1cead99080e7a 100644 --- a/nixos/tests/incus/openvswitch.nix +++ b/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/nixos/tests/incus/socket-activated.nix b/nixos/tests/incus/socket-activated.nix index 59caf1090fbd8..55c5496396e91 100644 --- a/nixos/tests/incus/socket-activated.nix +++ b/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/nixos/tests/incus/storage.nix b/nixos/tests/incus/storage.nix index 190f4f7451c20..05ea6ba996eb2 100644 --- a/nixos/tests/incus/storage.nix +++ b/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/nixos/tests/incus/ui.nix b/nixos/tests/incus/ui.nix index 837eb14844cea..a255d6fabe839 100644 --- a/nixos/tests/incus/ui.nix +++ b/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/nixos/tests/incus/virtual-machine.nix b/nixos/tests/incus/virtual-machine.nix index c460447f7832d..70e54191d3304 100644 --- a/nixos/tests/incus/virtual-machine.nix +++ b/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 { @@ -33,7 +33,10 @@ in # Provide a TPM to test vTPM support for guests tpm.enable = true; - incus.enable = true; + incus = { + enable = true; + package = incus; + }; }; networking.nftables.enable = true; }; diff --git a/nixos/tests/k3s/default.nix b/nixos/tests/k3s/default.nix index 512dc06ee77ec..297b05a4e4a74 100644 --- a/nixos/tests/k3s/default.nix +++ b/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/nixos/tests/k3s/etcd.nix b/nixos/tests/k3s/etcd.nix index d6e9a294adb13..ac0aa90472516 100644 --- a/nixos/tests/k3s/etcd.nix +++ b/nixos/tests/k3s/etcd.nix @@ -1,100 +1,130 @@ -import ../make-test-python.nix ({ pkgs, lib, k3s, etcd, ... }: - -{ - name = "${k3s.name}-etcd"; - - 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; } - ]; - }; - }; +import ../make-test-python.nix ( + { + pkgs, + lib, + k3s, + etcd, + ... + }: + + { + name = "${k3s.name}-etcd"; + + 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 ]; + 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/nixos/tests/k3s/multi-node.nix b/nixos/tests/k3s/multi-node.nix index 20279f3ca4b93..b618d2aff34c4 100644 --- a/nixos/tests/k3s/multi-node.nix +++ b/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; - - 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" + 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" + ]; + }; + 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; - - 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" + + 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" + ]; + }; + 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/nixos/tests/k3s/single-node.nix b/nixos/tests/k3s/single-node.nix index b7ac5d9eeeac7..80d80a55ddf41 100644 --- a/nixos/tests/k3s/single-node.nix +++ b/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,69 +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'") - 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" + 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-") + # 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() - ''; - }) + machine.shutdown() + ''; + } +) diff --git a/nixos/tests/private-gpt.nix b/nixos/tests/private-gpt.nix new file mode 100644 index 0000000000000..d19e167cc303c --- /dev/null +++ b/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/nixos/tests/web-apps/pretalx.nix b/nixos/tests/web-apps/pretalx.nix index a226639b076b4..76e261b2207ec 100644 --- a/nixos/tests/web-apps/pretalx.nix +++ b/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/pkgs/applications/audio/ensemble-chorus/default.nix b/pkgs/applications/audio/ensemble-chorus/default.nix index 7fcf412dd593f..a83719a5e4161 100644 --- a/pkgs/applications/audio/ensemble-chorus/default.nix +++ b/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/pkgs/applications/audio/ensemble-chorus/juice-cxx-packing-fix.diff b/pkgs/applications/audio/ensemble-chorus/juice-cxx-packing-fix.diff new file mode 100644 index 0000000000000..041f252a81e02 --- /dev/null +++ b/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/pkgs/applications/audio/feishin/default.nix b/pkgs/applications/audio/feishin/default.nix index e0e35bae6df09..90561314fec90 100644 --- a/pkgs/applications/audio/feishin/default.nix +++ b/pkgs/applications/audio/feishin/default.nix @@ -11,13 +11,13 @@ }: 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; @@ -26,7 +26,7 @@ buildNpmPackage { inherit pname version; inherit src; - npmDepsHash = "sha256-+pr9fWg/9kxkYMmthtqhjgF6MOomSQxVCO5V8tHHRdE="; + npmDepsHash = "sha256-7oh5bl5APAvzb/TxHMUP/saRWLwuP9xqGvn7/RDhFk8="; npmFlags = [ "--legacy-peer-deps" ]; makeCacheWritable = true; @@ -60,7 +60,7 @@ buildNpmPackage { inherit version; src = "${src}/release/app"; - npmDepsHash = "sha256-MRwKxe1hoFs5bPXT6K/UspSDs9XBdcRJGvxGlTKExp4="; + npmDepsHash = "sha256-NgWPr3mctn7f6X2JFsbdNNHkN84RRlLAywqfbyahCQw="; npmFlags = [ "--ignore-scripts" ]; dontNpmBuild = true; diff --git a/pkgs/applications/audio/ft2-clone/default.nix b/pkgs/applications/audio/ft2-clone/default.nix index 1f05808536e18..1af7a8a00d3d6 100644 --- a/pkgs/applications/audio/ft2-clone/default.nix +++ b/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/pkgs/applications/audio/ncspot/default.nix b/pkgs/applications/audio/ncspot/default.nix index 1bc391b4b55c8..d5abb66d23981 100644 --- a/pkgs/applications/audio/ncspot/default.nix +++ b/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; diff --git a/pkgs/applications/audio/pyradio/default.nix b/pkgs/applications/audio/pyradio/default.nix index d6d5a6d78a6c5..45cec01bd6985 100644 --- a/pkgs/applications/audio/pyradio/default.nix +++ b/pkgs/applications/audio/pyradio/default.nix @@ -6,13 +6,13 @@ python3Packages.buildPythonApplication rec { pname = "pyradio"; - version = "0.9.3.4"; + version = "0.9.3.6"; src = fetchFromGitHub { owner = "coderholic"; repo = "pyradio"; rev = "refs/tags/${version}"; - hash = "sha256-QifBzQsvYU5kP5mnidOgWGBh3h2MvJm8Wo0i1v6j/cU="; + hash = "sha256-As4xjwJtEKlnFuBigC7nN0kAPe0+99rE9KZ0F6i7qIQ="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/blockchains/exodus/default.nix b/pkgs/applications/blockchains/exodus/default.nix index b6f2539b02daf..b4e737fa78055 100644 --- a/pkgs/applications/blockchains/exodus/default.nix +++ b/pkgs/applications/blockchains/exodus/default.nix @@ -27,13 +27,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "exodus"; - version = "24.17.5"; + version = "24.19.3"; src = fetchurl { 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" ]; - hash = "sha256-HlyscqoxGucoQoFgSWN3vEjAnkdAmtBLOhjhWbScPFc="; + hash = "sha256-zqi1En22H3b2pD95C747gF9TtyMCX4TzXC10mP7iUoM="; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix index 30d0d83f97327..cca22bda6740d 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix @@ -16,7 +16,7 @@ }: let - rev = "75b1431c1e0f6c221dbfdb0ecd0f62f183b02254"; + rev = "b8768c4a76525d82360d124c829774acd26634c3"; python = python3.withPackages (ps: with ps; [ epc orjson @@ -28,13 +28,13 @@ let in melpaBuild { pname = "lsp-bridge"; - version = "20240502.2306"; + version = "20240510.1618"; src = fetchFromGitHub { owner = "manateelazycat"; repo = "lsp-bridge"; inherit rev; - hash = "sha256-8MqGwHVBE+87IQfsUA6b3ffrVWjypiH3shwELBCUBDQ="; + hash = "sha256-f+JnzW4XrDC3QP9iuhKAmy+T2adoFx+0q03GI7VO0/s="; }; commit = rev; diff --git a/pkgs/applications/editors/quartus-prime/default.nix b/pkgs/applications/editors/quartus-prime/default.nix index 2b3ee40951755..dfe977876231b 100644 --- a/pkgs/applications/editors/quartus-prime/default.nix +++ b/pkgs/applications/editors/quartus-prime/default.nix @@ -17,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" {} ('' @@ -80,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}/"}" @@ -93,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 @@ -160,4 +161,6 @@ in buildFHSEnv rec { ''; }; }; + + inherit (unwrapped) meta; } diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 616d46e65190f..5bd533dd11fcc 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -15376,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"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 71da655f81ad1..acdd809e54387 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -1295,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/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 8c3347e9aed74..c0ab7f2f8736e 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -2205,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"; diff --git a/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix b/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix index b3f9d1916835a..b8281e83c564b 100644 --- a/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix +++ b/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.7"; - hash = "sha256-pL61pu8xTsjOOn4vYBwrWc6JKhrzRyNjQmJmrezUcyk="; + version = "0.11.8"; + hash = "sha256-ELqk94xhPJwHlxQ0ie9DMBNOiqszpi3mYF+wHxoY2xw="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/emulators/cemu/default.nix b/pkgs/applications/emulators/cemu/default.nix index 69f6fccd73c82..483bd8d4d5098 100644 --- a/pkgs/applications/emulators/cemu/default.nix +++ b/pkgs/applications/emulators/cemu/default.nix @@ -46,13 +46,13 @@ let in stdenv.mkDerivation rec { pname = "cemu"; - version = "2.0-80"; + version = "2.0-82"; src = fetchFromGitHub { owner = "cemu-project"; repo = "Cemu"; rev = "v${version}"; - hash = "sha256-uNGRiotitt+fWpJFCno04XiCSD1p38QEqw042Bq/IGc="; + hash = "sha256-rmlkit7ZNUM0ErqoclivfBHolV0tRWyToLmsvoTslbI="; }; patches = [ diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json index 4115c489b2e4e..a612379f0e692 100644 --- a/pkgs/applications/emulators/retroarch/hashes.json +++ b/pkgs/applications/emulators/retroarch/hashes.json @@ -408,21 +408,21 @@ "src": { "owner": "libretro", "repo": "mame", - "rev": "3272473e69880675756547fc5896d0869ba14255", - "hash": "sha256-DWDPQM4YWuH4oH+03VmFs6yXN2dAKxc5zXSV42YbMyg=", + "rev": "1c6d288bf15705ab93c66a11af40eaf9d2a515a2", + "hash": "sha256-h5hMfCwoECTyH/VU7IheQg5Jx9skpYrZlA9Xh+4lotQ=", "fetchSubmodules": true }, - "version": "unstable-2024-05-04" + "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", @@ -652,11 +652,11 @@ "src": { "owner": "jpd002", "repo": "Play-", - "rev": "9f8d623f5d7e6a9bb6fa7ff30ce4d5b1fdf72a1e", - "hash": "sha256-DtPIAQGHXR3urmKeFXNfKIdqQVU3HrrH6M28Ctwj3eI=", + "rev": "700a44a1548d099705c901203414724518c90d43", + "hash": "sha256-OZO8vVA2B/SdckC2Rm/v35cdJDzkpdU9lJhFYEyyl1U=", "fetchSubmodules": true }, - "version": "unstable-2024-05-01" + "version": "unstable-2024-05-05" }, "ppsspp": { "fetcher": "fetchFromGitHub", diff --git a/pkgs/applications/emulators/wine/base.nix b/pkgs/applications/emulators/wine/base.nix index b290a324f9700..1c62a9aad97d3 100644 --- a/pkgs/applications/emulators/wine/base.nix +++ b/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/pkgs/applications/emulators/wine/darwin-metal-compat-pre8.12.patch b/pkgs/applications/emulators/wine/darwin-metal-compat-pre8.12.patch deleted file mode 100644 index aaf8a1b89bfdf..0000000000000 --- a/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/pkgs/applications/emulators/wine/darwin-metal-compat-pre8.18.patch b/pkgs/applications/emulators/wine/darwin-metal-compat-pre8.18.patch deleted file mode 100644 index 181b2a0d1a47a..0000000000000 --- a/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/pkgs/applications/emulators/wine/darwin-metal-compat.patch b/pkgs/applications/emulators/wine/darwin-metal-compat.patch deleted file mode 100644 index 8176be8ef3830..0000000000000 --- a/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/pkgs/applications/emulators/wine/darwin-qos.patch b/pkgs/applications/emulators/wine/darwin-qos.patch deleted file mode 100644 index e9bd813feaab0..0000000000000 --- a/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 <pthread.h> -+# include <pthread/qos.h> - # include <mach/mach.h> - # include <mach/mach_error.h> - # include <mach-o/getsect.h> diff --git a/pkgs/applications/emulators/wine/sources.nix b/pkgs/applications/emulators/wine/sources.nix index 9ee1f53601a3b..62fc12dd4eaf3 100644 --- a/pkgs/applications/emulators/wine/sources.nix +++ b/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.7"; + version = "9.8"; url = "https://dl.winehq.org/wine/source/9.x/wine-${version}.tar.xz"; - hash = "sha256-2fPDM2VuiL1M71Mx80sci2nJZKUnWe73RdjdrlGhU1M="; + hash = "sha256-hpQ8g47aj62aeUDUCZcDOUvx0b6aEBQ0L+2HnH3DuZM="; inherit (stable) patches; ## see http://wiki.winehq.org/Gecko @@ -117,7 +117,7 @@ in rec { staging = fetchFromGitLab rec { # https://gitlab.winehq.org/wine/wine-staging inherit (unstable) version; - hash = "sha256-KU6i1P81Fr+4aZH/SJ+YibaIfX88SZMPdPcGS2mT2CE="; + hash = "sha256-c69E+jr5DKdD8JJxQhM3ILJgvmGvOe54FqMghcVPkpg="; domain = "gitlab.winehq.org"; owner = "wine"; repo = "wine-staging"; diff --git a/pkgs/applications/emulators/wine/staging.nix b/pkgs/applications/emulators/wine/staging.nix index 0a99e6d42a87b..56525d4fa0674 100644 --- a/pkgs/applications/emulators/wine/staging.nix +++ b/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/pkgs/applications/graphics/lightburn/default.nix b/pkgs/applications/graphics/lightburn/default.nix index e9ca6b52a0410..19455d89c930b 100644 --- a/pkgs/applications/graphics/lightburn/default.nix +++ b/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/pkgs/applications/graphics/oculante/default.nix b/pkgs/applications/graphics/oculante/default.nix index a0c8da4705556..c2f2840a5dee2 100644 --- a/pkgs/applications/graphics/oculante/default.nix +++ b/pkgs/applications/graphics/oculante/default.nix @@ -22,16 +22,16 @@ rustPlatform.buildRustPackage rec { pname = "oculante"; - version = "0.8.19"; + version = "0.8.21"; src = fetchFromGitHub { owner = "woelper"; repo = "oculante"; rev = version; - hash = "sha256-oCgnz1WMg7YypIT8Tjk2m+f/43Aj88rDVCxQ92aL3RY="; + hash = "sha256-2QX7cD9SjhLb82O8T90BTQGsy3/gDaNwoX4Mbe2H6s4="; }; - cargoHash = "sha256-vlU7egAht+kgA5Vx0HAwQOIax9qD4FLRo1ZUNx4RieY="; + cargoHash = "sha256-VAWLs15xsjoT0VSJjS/j0wd5P7OjQGrvyUSHp4B8hHI="; nativeBuildInputs = [ cmake diff --git a/pkgs/applications/graphics/snapshot/default.nix b/pkgs/applications/graphics/snapshot/default.nix index e449daac6dcc8..d05bfe3e349be 100644 --- a/pkgs/applications/graphics/snapshot/default.nix +++ b/pkgs/applications/graphics/snapshot/default.nix @@ -18,11 +18,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "snapshot"; - version = "46.2"; + version = "46.3"; src = fetchurl { url = "mirror://gnome/sources/snapshot/${lib.versions.major finalAttrs.version}/snapshot-${finalAttrs.version}.tar.xz"; - hash = "sha256-Ef55oSuzQFHionnajB9FRYfQEaFPwkI35FTGT0S6z00="; + hash = "sha256-RZV6BBX0VNY1MUkaoEeVzuDO1O3d1dj6DQAPXvBzW2c="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/cotp/default.nix b/pkgs/applications/misc/cotp/default.nix index 38308f4daa409..9466d28dcebfe 100644 --- a/pkgs/applications/misc/cotp/default.nix +++ b/pkgs/applications/misc/cotp/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "cotp"; - version = "1.6.0"; + version = "1.6.1"; src = fetchFromGitHub { owner = "replydev"; repo = "cotp"; rev = "v${version}"; - hash = "sha256-X3o3KgTHnhekdiSFdrCwLOrd0HKvCd8Z5jR2WpY1D6Q="; + hash = "sha256-QWx42uSjN6Dev5JTa8vPTXOxr8qw5kerLepTWhJTb1I="; }; - cargoHash = "sha256-zaVNfgWXqHQaogGTaR1eE5u3gYU9SQ0nk0VO7NL5mvg="; + cargoHash = "sha256-5PUVg08D8cZdUIt1A9wjpi9bc/XsB9P7S6L8M054MCg="; buildInputs = lib.optionals stdenv.isLinux [ libxcb ] ++ lib.optionals stdenv.isDarwin [ AppKit ]; diff --git a/pkgs/applications/misc/exercism/default.nix b/pkgs/applications/misc/exercism/default.nix index d91f359804049..b3ea4b96b9151 100644 --- a/pkgs/applications/misc/exercism/default.nix +++ b/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/pkgs/applications/misc/fluidd/default.nix b/pkgs/applications/misc/fluidd/default.nix index 150bbd5700371..3694f8e232201 100644 --- a/pkgs/applications/misc/fluidd/default.nix +++ b/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/pkgs/applications/misc/hmm/default.nix b/pkgs/applications/misc/hmm/default.nix index a78b953875c20..4f45c09ef63b1 100644 --- a/pkgs/applications/misc/hmm/default.nix +++ b/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/pkgs/applications/misc/hmm/rustc-serialize-fix.patch b/pkgs/applications/misc/hmm/rustc-serialize-fix.patch new file mode 100644 index 0000000000000..8d0327e8a4578 --- /dev/null +++ b/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/pkgs/applications/misc/k40-whisperer/default.nix b/pkgs/applications/misc/k40-whisperer/default.nix index a6059ae44f88f..5893ceb920f5b 100644 --- a/pkgs/applications/misc/k40-whisperer/default.nix +++ b/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/pkgs/applications/misc/nwg-panel/default.nix b/pkgs/applications/misc/nwg-panel/default.nix index 064fead047334..3ee48328717d1 100644 --- a/pkgs/applications/misc/nwg-panel/default.nix +++ b/pkgs/applications/misc/nwg-panel/default.nix @@ -16,13 +16,13 @@ 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 diff --git a/pkgs/applications/misc/remarkable/rmview/default.nix b/pkgs/applications/misc/remarkable/rmview/default.nix index 52ad1dce2688e..40ffc4df8b912 100644 --- a/pkgs/applications/misc/remarkable/rmview/default.nix +++ b/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/pkgs/applications/misc/ttdl/default.nix b/pkgs/applications/misc/ttdl/default.nix index d4a74e6bdbc1c..a67742aa63308 100644 --- a/pkgs/applications/misc/ttdl/default.nix +++ b/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/pkgs/applications/misc/wmenu/default.nix b/pkgs/applications/misc/wmenu/default.nix index 23d9f2404ea20..72d437f74cc40 100644 --- a/pkgs/applications/misc/wmenu/default.nix +++ b/pkgs/applications/misc/wmenu/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { pname = "wmenu"; - version = "0.1.7"; + version = "0.1.8"; strictDeps = true; @@ -24,17 +24,9 @@ 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 wayland-scanner ]; buildInputs = [ cairo pango wayland libxkbcommon wayland-protocols scdoc ]; diff --git a/pkgs/applications/networking/avalanchego/default.nix b/pkgs/applications/networking/avalanchego/default.nix index a6e0f5d588606..63d45b86fa7a5 100644 --- a/pkgs/applications/networking/avalanchego/default.nix +++ b/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/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 20e987facdc3c..259309757b11c 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -241,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 @@ -418,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/pkgs/applications/networking/browsers/chromium/patches/widevine-79.patch b/pkgs/applications/networking/browsers/chromium/patches/widevine-79.patch deleted file mode 100644 index 32f0ae2fb5e66..0000000000000 --- a/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/pkgs/applications/networking/browsers/chromium/patches/widevine-disable-auto-download-allow-bundle.patch b/pkgs/applications/networking/browsers/chromium/patches/widevine-disable-auto-download-allow-bundle.patch new file mode 100644 index 0000000000000..d4f16d26b769e --- /dev/null +++ b/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/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index 245cdd073fc0e..9e91cd5725df0 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -1,11 +1,11 @@ { stable = { chromedriver = { - hash_darwin = "sha256-4MZwD2jgjOrBTtkjxW0XH+lZfP8wj7Z6eg7LwFziCPU="; + hash_darwin = "sha256-jnWmH6MzqZzzIAblvJFv5jKFJ2LILyGy+eOqb6sWmWc="; hash_darwin_aarch64 = - "sha256-P9qi8rR8DW+WOT+ev2EgA93StnGrBiIHu2UbkEhS+0M="; - hash_linux = "sha256-eudgRu3OMuTBTeX8zrm6ShgmjcsNhzaBYEAP/4n1SJk="; - version = "124.0.6367.155"; + "sha256-FO0kncAPj/cBwlGN2RdFGR7Bn5pKzTRlf2IQ422mm5c="; + hash_linux = "sha256-3khPV+WPcYHrlGNFXhmRrja2+wWsr77BVgHLbSe0IF8="; + version = "124.0.6367.201"; }; deps = { gn = { @@ -15,9 +15,9 @@ version = "2024-03-14"; }; }; - hash = "sha256-Qv1xYofY4Tgj+WT1a8ehOo7R52CwZz2vCK9MDSnjmsg="; - hash_deb_amd64 = "sha256-lFG5l3K2Yo1BYbXS9bK+9gWx6JxFrPxpT+zI7dBXQ6E="; - version = "124.0.6367.155"; + hash = "sha256-nSI+tkJxOedMtYgtiqW37v0ZjgxxU5o/0sH9bPAchBg="; + hash_deb_amd64 = "sha256-RvQdpDmWRcsASh1b8M0Zg+AvZprE5qhi14shfo0WlfE="; + version = "124.0.6367.201"; }; ungoogled-chromium = { deps = { @@ -28,12 +28,12 @@ version = "2024-03-14"; }; ungoogled-patches = { - hash = "sha256-RS6flauUQjd+NPqUIppwlgtjOKxJa5+OTnL4aI3gRcs="; - rev = "124.0.6367.155-1"; + hash = "sha256-fy4SydGRRyDhJZ7IADG54+rGWh2i+2SrSkuCglphhm8="; + rev = "124.0.6367.201-1"; }; }; - hash = "sha256-Qv1xYofY4Tgj+WT1a8ehOo7R52CwZz2vCK9MDSnjmsg="; - hash_deb_amd64 = "sha256-lFG5l3K2Yo1BYbXS9bK+9gWx6JxFrPxpT+zI7dBXQ6E="; - version = "124.0.6367.155"; + hash = "sha256-nSI+tkJxOedMtYgtiqW37v0ZjgxxU5o/0sH9bPAchBg="; + hash_deb_amd64 = "sha256-RvQdpDmWRcsASh1b8M0Zg+AvZprE5qhi14shfo0WlfE="; + version = "124.0.6367.201"; }; } diff --git a/pkgs/applications/networking/browsers/opera/default.nix b/pkgs/applications/networking/browsers/opera/default.nix index e8638a1313f9e..fc80fd76c102f 100644 --- a/pkgs/applications/networking/browsers/opera/default.nix +++ b/pkgs/applications/networking/browsers/opera/default.nix @@ -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 ."; diff --git a/pkgs/applications/networking/cluster/arkade/default.nix b/pkgs/applications/networking/cluster/arkade/default.nix index 2ad7f717252b5..c4e155a0517cf 100644 --- a/pkgs/applications/networking/cluster/arkade/default.nix +++ b/pkgs/applications/networking/cluster/arkade/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "arkade"; - version = "0.11.10"; + version = "0.11.11"; src = fetchFromGitHub { owner = "alexellis"; repo = "arkade"; rev = version; - hash = "sha256-Uw+/pVhbGYjFTcrh90Gstu5KddlkXKuzL2lbQ7CFLGs="; + hash = "sha256-Pevsq/u6sI00k874PiAVwzgTqzzja1D2zsfebIFJv/0="; }; CGO_ENABLED = 0; diff --git a/pkgs/applications/networking/cluster/atmos/default.nix b/pkgs/applications/networking/cluster/atmos/default.nix index d5cd9a0851421..2163adf6d5b26 100644 --- a/pkgs/applications/networking/cluster/atmos/default.nix +++ b/pkgs/applications/networking/cluster/atmos/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "atmos"; - version = "1.71.0"; + version = "1.72.0"; src = fetchFromGitHub { owner = "cloudposse"; repo = pname; rev = "v${version}"; - sha256 = "sha256-RnBMVVbZQrJ85uPVLniNjpcledYnOyu5zxIYsvV63qk="; + sha256 = "sha256-d4TgVSXTqrzgTdpGl1uXIdEvwb0EIgzqiEjOaWYAZgk="; }; - vendorHash = "sha256-dcQWD6UrsSPJZzasovBSXUKaXvL9mZF6cLp458Ia8O4="; + vendorHash = "sha256-T3FvJfyGseW5vwN/mMCFEjpcpW90MG8QPkmaXJafD4s="; ldflags = [ "-s" "-w" "-X github.com/cloudposse/atmos/cmd.Version=v${version}" ]; diff --git a/pkgs/applications/networking/cluster/k0sctl/default.nix b/pkgs/applications/networking/cluster/k0sctl/default.nix index 674adcf585d6a..ff8957db2b2cb 100644 --- a/pkgs/applications/networking/cluster/k0sctl/default.nix +++ b/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/pkgs/applications/networking/cluster/k3s/1_26/chart-versions.nix b/pkgs/applications/networking/cluster/k3s/1_26/chart-versions.nix index 1acca4d0e101f..a0341b7cbdec9 100644 --- a/pkgs/applications/networking/cluster/k3s/1_26/chart-versions.nix +++ b/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/pkgs/applications/networking/cluster/k3s/1_27/chart-versions.nix b/pkgs/applications/networking/cluster/k3s/1_27/chart-versions.nix index 7595645c35b54..aaaa3d4c29700 100644 --- a/pkgs/applications/networking/cluster/k3s/1_27/chart-versions.nix +++ b/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.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"; - }; + 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/pkgs/applications/networking/cluster/k3s/1_28/chart-versions.nix b/pkgs/applications/networking/cluster/k3s/1_28/chart-versions.nix index 7595645c35b54..aaaa3d4c29700 100644 --- a/pkgs/applications/networking/cluster/k3s/1_28/chart-versions.nix +++ b/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.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"; - }; + 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/pkgs/applications/networking/cluster/k3s/1_29/chart-versions.nix b/pkgs/applications/networking/cluster/k3s/1_29/chart-versions.nix index 7595645c35b54..aaaa3d4c29700 100644 --- a/pkgs/applications/networking/cluster/k3s/1_29/chart-versions.nix +++ b/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.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"; - }; + 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/pkgs/applications/networking/cluster/k3s/builder.nix b/pkgs/applications/networking/cluster/k3s/builder.nix index 44910857c3e46..247ab0f339daa 100644 --- a/pkgs/applications/networking/cluster/k3s/builder.nix +++ b/pkgs/applications/networking/cluster/k3s/builder.nix @@ -29,41 +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 -, 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 +{ + 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 @@ -91,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 @@ -231,12 +238,19 @@ let vendorHash = k3sVendorHash; 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 = '' @@ -282,7 +296,11 @@ buildGoModule rec { pname = "k3s"; version = k3sVersion; - tags = [ "libsqlite3" "linux" "ctrd" ]; + tags = [ + "libsqlite3" + "linux" + "ctrd" + ]; src = k3sRepo; vendorHash = k3sVendorHash; @@ -400,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/pkgs/applications/networking/cluster/k3s/default.nix b/pkgs/applications/networking/cluster/k3s/default.nix index 934f5a3691cde..8151e488a858c 100644 --- a/pkgs/applications/networking/cluster/k3s/default.nix +++ b/pkgs/applications/networking/cluster/k3s/default.nix @@ -12,22 +12,46 @@ 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; } diff --git a/pkgs/applications/networking/cluster/k3s/update-script.sh b/pkgs/applications/networking/cluster/k3s/update-script.sh index 9f534f4d179a7..ca7d21bff4781 100755 --- a/pkgs/applications/networking/cluster/k3s/update-script.sh +++ b/pkgs/applications/networking/cluster/k3s/update-script.sh @@ -57,14 +57,14 @@ CHARTS_URL=https://k3s.io/k3s-charts/assets rm -f chart-versions.nix.update cat > chart-versions.nix.update <<EOF { - traefik-crd = { - url = "${CHARTS_URL}/traefik-crd/${CHART_FILES[0]}"; - sha256 = "$(nix-prefetch-url --quiet "${CHARTS_URL}/traefik-crd/${CHART_FILES[0]}")"; - }; - traefik = { - url = "${CHARTS_URL}/traefik/${CHART_FILES[1]}"; - sha256 = "$(nix-prefetch-url --quiet "${CHARTS_URL}/traefik/${CHART_FILES[1]}")"; - }; + traefik-crd = { + url = "${CHARTS_URL}/traefik-crd/${CHART_FILES[0]}"; + sha256 = "$(nix-prefetch-url --quiet "${CHARTS_URL}/traefik-crd/${CHART_FILES[0]}")"; + }; + traefik = { + url = "${CHARTS_URL}/traefik/${CHART_FILES[1]}"; + sha256 = "$(nix-prefetch-url --quiet "${CHARTS_URL}/traefik/${CHART_FILES[1]}")"; + }; } EOF mv chart-versions.nix.update chart-versions.nix diff --git a/pkgs/applications/networking/cluster/kubefirst/default.nix b/pkgs/applications/networking/cluster/kubefirst/default.nix index 2e654d15d0b0c..5e76464523838 100644 --- a/pkgs/applications/networking/cluster/kubefirst/default.nix +++ b/pkgs/applications/networking/cluster/kubefirst/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "kubefirst"; - version = "2.4.6"; + version = "2.4.8"; src = fetchFromGitHub { owner = "kubefirst"; repo = "kubefirst"; rev = "refs/tags/v${version}"; - hash = "sha256-PjqTtu9n9AqHaYnc/2yVQeIWLiQrQcFNdumDSigY7dY="; + hash = "sha256-r5y1eWjcw0HP/E9AQodEdCgWgKikGrwV6TvZ2mVcuoE="; }; vendorHash = "sha256-ZcZl4knlyKAwTsiyZvlkN5e2ox30B5aNzutI/2UEE9U="; diff --git a/pkgs/applications/networking/cluster/linkerd/edge.nix b/pkgs/applications/networking/cluster/linkerd/edge.nix index 17e252c9c161b..a2c84cc4ae11e 100644 --- a/pkgs/applications/networking/cluster/linkerd/edge.nix +++ b/pkgs/applications/networking/cluster/linkerd/edge.nix @@ -2,7 +2,7 @@ (callPackage ./generic.nix { }) { channel = "edge"; - version = "24.4.5"; - sha256 = "0cxjilxsvbwahqh3wb3cw4z8fmq6lhxi531abrncs74kgasgcfam"; - vendorHash = "sha256-YxavLLYppV991AgFb2WaQDbqnsr3UfrvWefvkSf+W1Q="; + version = "24.5.1"; + sha256 = "1l358gmivhpjyibcar8z4c3jlz6rwmlyzki71ar5j2k9irdjzqa3"; + vendorHash = "sha256-sLLgTZN7Zvxkf9J1omh/YGMBUgAtvQD+nbhSuR7/PZg="; } diff --git a/pkgs/applications/networking/cluster/nerdctl/default.nix b/pkgs/applications/networking/cluster/nerdctl/default.nix index 8f7a59c70e8ad..0ef96ddf69a4a 100644 --- a/pkgs/applications/networking/cluster/nerdctl/default.nix +++ b/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/pkgs/applications/networking/coreth/default.nix b/pkgs/applications/networking/coreth/default.nix index c1ad822138ab7..e5af4fa397ed9 100644 --- a/pkgs/applications/networking/coreth/default.nix +++ b/pkgs/applications/networking/coreth/default.nix @@ -6,19 +6,19 @@ buildGoModule rec { pname = "coreth"; - version = "0.13.2"; + version = "0.13.3"; src = fetchFromGitHub { owner = "ava-labs"; repo = pname; rev = "v${version}"; - hash = "sha256-G3Ovu/tF7gCeddmE91nht/yyqJJtgMyIi7YbTtUFyKo="; + hash = "sha256-XVACkk/DUI4AIPRSQgu0g9WHmedjqscZbcz84HIi7jY="; }; # go mod vendor has a bug, see: golang/go#57529 proxyVendor = true; - vendorHash = "sha256-IJFRtoDd0GO8mIx8mmGixaYK5JDQeSpUfk0MPPX6cX8="; + vendorHash = "sha256-zqvo0hZIOyF5Bzig1hi4KRUDETNiiy1Ll/FFO9hRmYU="; ldflags = [ "-s" diff --git a/pkgs/applications/networking/datovka/default.nix b/pkgs/applications/networking/datovka/default.nix index bfffc97df6e69..3ed7a26138c87 100644 --- a/pkgs/applications/networking/datovka/default.nix +++ b/pkgs/applications/networking/datovka/default.nix @@ -12,11 +12,11 @@ mkDerivation rec { pname = "datovka"; - version = "4.23.6"; + version = "4.23.7"; src = fetchurl { url = "https://gitlab.nic.cz/datovka/datovka/-/archive/v${version}/datovka-v${version}.tar.gz"; - sha256 = "sha256-g6IMUAE8z5uoLSUpoT+GradQRgwyIXNANt7g4JPOCxg="; + sha256 = "sha256-mGuTxOqudDhoJKZ9517H+A4PZxBqAOD+PfBHunhPXGw="; }; buildInputs = [ libdatovka qmake qtbase qtsvg libxml2 qtwebsockets ]; diff --git a/pkgs/applications/networking/gns3/server.nix b/pkgs/applications/networking/gns3/server.nix index f9939000f7440..3e4764a145024 100644 --- a/pkgs/applications/networking/gns3/server.nix +++ b/pkgs/applications/networking/gns3/server.nix @@ -4,16 +4,17 @@ }: { lib -, python3 +, python3Packages , fetchFromGitHub , pkgsStatic , stdenv , nixosTests , testers +, util-linux , gns3-server }: -python3.pkgs.buildPythonApplication { +python3Packages.buildPythonApplication { pname = "gns3-server"; inherit version; @@ -29,7 +30,7 @@ python3.pkgs.buildPythonApplication { cp ${pkgsStatic.busybox}/bin/busybox gns3server/compute/docker/resources/bin/busybox ''; - propagatedBuildInputs = with python3.pkgs; [ + propagatedBuildInputs = with python3Packages; [ aiofiles aiohttp aiohttp-cors @@ -55,6 +56,9 @@ python3.pkgs.buildPythonApplication { rm $out/bin/gns3loopback ''; + # util-linux (script program) is required for Docker support + makeWrapperArgs = [ "--suffix PATH : ${lib.makeBinPath [ util-linux ]}" ]; + doCheck = true; # Otherwise tests will fail to create directory @@ -63,7 +67,7 @@ python3.pkgs.buildPythonApplication { export HOME=$(mktemp -d) ''; - checkInputs = with python3.pkgs; [ + checkInputs = with python3Packages; [ pytest-aiohttp pytest-rerunfailures (pytestCheckHook.override { pytest = pytest_7; }) diff --git a/pkgs/applications/networking/ids/suricata/default.nix b/pkgs/applications/networking/ids/suricata/default.nix index 7661ec3cfbbef..823a455fe857b 100644 --- a/pkgs/applications/networking/ids/suricata/default.nix +++ b/pkgs/applications/networking/ids/suricata/default.nix @@ -33,11 +33,11 @@ in stdenv.mkDerivation rec { pname = "suricata"; - version = "7.0.4"; + version = "7.0.5"; src = fetchurl { url = "https://www.openinfosecfoundation.org/download/${pname}-${version}.tar.gz"; - hash = "sha256-ZABgEgAkvnDb6B9uxu/HLkYlD8s2IZ3/Z+ZBciD/Ibc="; + hash = "sha256-H/tWgVjyZcCFVEZL+4VOZWjvaDvwMxKSO1HyjFB5Ck4="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/instant-messengers/alfaview/default.nix b/pkgs/applications/networking/instant-messengers/alfaview/default.nix index c8bea44ddd787..f1c8367b91c30 100644 --- a/pkgs/applications/networking/instant-messengers/alfaview/default.nix +++ b/pkgs/applications/networking/instant-messengers/alfaview/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "alfaview"; - version = "9.9.1"; + version = "9.10.1"; src = fetchurl { url = "https://assets.alfaview.com/stable/linux/deb/${pname}_${version}.deb"; - hash = "sha256-GZLIVpXQ22W4JykdLJ7pTogOFhDaiukgsLa2E7giiaU="; + hash = "sha256-k58v8l/LE0lWQFbQ6p2XGiRjMMwzArW3KVbIxlKC1SA="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/generic.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/generic.nix index 3e69f19aaf48d..2c73686e76837 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/generic.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/generic.nix @@ -158,7 +158,8 @@ stdenv.mkDerivation rec { # Fix the desktop link substituteInPlace $out/share/applications/${pname}.desktop \ - --replace "/opt/${dir}/${pname}" $out/bin/${pname} + --replace "/opt/${dir}/${pname}" $out/bin/${pname} \ + --replace-fail "StartupWMClass=Signal" "StartupWMClass=signal" # Note: The following path contains bundled libraries: # $out/lib/${dir}/resources/app.asar.unpacked/node_modules/ diff --git a/pkgs/applications/networking/irc/srain/default.nix b/pkgs/applications/networking/irc/srain/default.nix index 3493fa5497b4d..c083c1a8048a7 100644 --- a/pkgs/applications/networking/irc/srain/default.nix +++ b/pkgs/applications/networking/irc/srain/default.nix @@ -4,7 +4,7 @@ , pkg-config , gtk3 , libconfig -, libsoup +, libsoup_3 , libsecret , libayatana-appindicator , openssl @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "srain"; - version = "1.6.0"; + version = "1.7.0"; src = fetchFromGitHub { owner = "SrainApp"; repo = "srain"; rev = version; - hash = "sha256-IGAb24aDeBXyxuyb/EWUetQZJg28GJLT0WK7ZmmHgyg="; + hash = "sha256-mhnlHnF23+VZvSPNuTYYUVcA6Md4y2AGqEuJphY1/IY="; }; nativeBuildInputs = [ @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { glib-networking dbus-glib libconfig - libsoup + libsoup_3 libsecret libayatana-appindicator openssl diff --git a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix index 5a55476d4b9e4..4c4c6ef1df6c4 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix @@ -1,47 +1,8 @@ -{ 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"; @@ -91,3 +52,7 @@ rec { }); }; } + // lib.optionalAttrs config.allowAliases { + thunderbird-102 = throw "Thunderbird 102 support ended in September 2023"; +} + diff --git a/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix b/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix index 29a892942018d..d82fe6652afef 100644 --- a/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix +++ b/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix @@ -5,11 +5,11 @@ 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 ]; diff --git a/pkgs/applications/networking/newsreaders/pan/default.nix b/pkgs/applications/networking/newsreaders/pan/default.nix index eb9b5ad3af95e..3a8418e48bda5 100644 --- a/pkgs/applications/networking/newsreaders/pan/default.nix +++ b/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/pkgs/applications/networking/sync/storj-uplink/default.nix b/pkgs/applications/networking/sync/storj-uplink/default.nix index 6ac38b50e8355..d2505a1a568f7 100644 --- a/pkgs/applications/networking/sync/storj-uplink/default.nix +++ b/pkgs/applications/networking/sync/storj-uplink/default.nix @@ -5,18 +5,18 @@ buildGoModule rec { pname = "storj-uplink"; - version = "1.102.4"; + version = "1.104.1"; src = fetchFromGitHub { owner = "storj"; repo = "storj"; rev = "v${version}"; - hash = "sha256-ryOWnVcJOUs9kToXtwjUTk7nwuAW0NCDn5Npn27hKXU="; + hash = "sha256-wB8SK91eJp+8Jjc/bfMqDQQC3FYtSLEjpqVdxEq9P3c="; }; subPackages = [ "cmd/uplink" ]; - vendorHash = "sha256-atIb/SmOShLIhvEsTcegX7+xoDXN+SI5a7TQrXpqdUg="; + vendorHash = "sha256-Eo6JHcTcfC8zmKZh9sXrZ90RhIgdEBgTldIUnvNm8ms="; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/applications/networking/trayscale/default.nix b/pkgs/applications/networking/trayscale/default.nix index 4571c91b77f20..72b204e11f8e7 100644 --- a/pkgs/applications/networking/trayscale/default.nix +++ b/pkgs/applications/networking/trayscale/default.nix @@ -11,13 +11,13 @@ buildGoModule rec { pname = "trayscale"; - version = "0.12.0"; + version = "0.12.3"; src = fetchFromGitHub { owner = "DeedleFake"; repo = "trayscale"; rev = "v${version}"; - hash = "sha256-GAK95XlRVGpoVcEmeFO3SddHpdn0qO7qs2IOj7qzRXQ="; + hash = "sha256-2mGPbH74a9d1uhRGMSEfrzCnwjgdgbopu20K9/g6wg0="; }; vendorHash = "sha256-Iedd8WsJPAVQexRqDSLAmv7MAWc4IFQXHk6XpnStMps="; diff --git a/pkgs/applications/networking/warp/default.nix b/pkgs/applications/networking/warp/default.nix index 52994f63e18c9..0861e72906db7 100644 --- a/pkgs/applications/networking/warp/default.nix +++ b/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/pkgs/applications/office/mendeley/default.nix b/pkgs/applications/office/mendeley/default.nix index c8ea46d0978e6..48384eca2998b 100644 --- a/pkgs/applications/office/mendeley/default.nix +++ b/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 { diff --git a/pkgs/applications/office/planify/default.nix b/pkgs/applications/office/planify/default.nix index 595b12bf9ab24..86117b22e8036 100644 --- a/pkgs/applications/office/planify/default.nix +++ b/pkgs/applications/office/planify/default.nix @@ -27,13 +27,13 @@ stdenv.mkDerivation rec { pname = "planify"; - version = "4.7"; + version = "4.7.2"; src = fetchFromGitHub { owner = "alainm23"; repo = "planify"; rev = version; - hash = "sha256-5hiVTU1w3Rk/BdxYwDB0Y+EZFnSAaEWtx19IB1ak1yY="; + hash = "sha256-G0A3U0TUGL4RT1wpIXw/cIwDDlaLCPpo5QG6bJfoIYc="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/office/timeular/default.nix b/pkgs/applications/office/timeular/default.nix index bf08311bad980..8f2ef94072b8d 100644 --- a/pkgs/applications/office/timeular/default.nix +++ b/pkgs/applications/office/timeular/default.nix @@ -5,12 +5,12 @@ }: let - version = "6.7.6"; + version = "6.7.8"; pname = "timeular"; src = fetchurl { url = "https://s3.amazonaws.com/timeular-desktop-packages/linux/production/Timeular-${version}.AppImage"; - hash = "sha256-wQUR2jLJi1peXqXJJj/72X9xNaD2DzNiB0mGFiaEWBE="; + hash = "sha256-nMvbr2PQBWyrhY3mv/4wsdWPhNx5hLFaAp0Ey3nvp7g="; }; appimageContents = appimageTools.extractType2 { diff --git a/pkgs/applications/radio/quisk/default.nix b/pkgs/applications/radio/quisk/default.nix index 8fa180e705c66..733f908ffc44f 100644 --- a/pkgs/applications/radio/quisk/default.nix +++ b/pkgs/applications/radio/quisk/default.nix @@ -8,11 +8,11 @@ python3.pkgs.buildPythonApplication rec { pname = "quisk"; - version = "4.2.32"; + version = "4.2.33"; src = fetchPypi { inherit pname version; - sha256 = "sha256-zzcygf7oVICO2/wfgyej1GD78fQB1xNRGHq19w6K4uY="; + sha256 = "sha256-41eyqYxRg0crtN6qp239eHWSFPt7XuJneTAndZuS3EY="; }; buildInputs = [ diff --git a/pkgs/applications/radio/tqsl/default.nix b/pkgs/applications/radio/tqsl/default.nix index bf6ee947785e9..01059cc434308 100644 --- a/pkgs/applications/radio/tqsl/default.nix +++ b/pkgs/applications/radio/tqsl/default.nix @@ -2,11 +2,11 @@ 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 wrapGAppsHook3 ]; diff --git a/pkgs/applications/science/biology/migrate/default.nix b/pkgs/applications/science/biology/migrate/default.nix index 31e4eb2fcb42b..7820f177bfb7b 100644 --- a/pkgs/applications/science/biology/migrate/default.nix +++ b/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/pkgs/applications/science/chemistry/octopus/default.nix b/pkgs/applications/science/chemistry/octopus/default.nix index a3a385802aaaa..2e87cf3db51aa 100644 --- a/pkgs/applications/science/chemistry/octopus/default.nix +++ b/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/pkgs/applications/science/math/sage/sagelib.nix b/pkgs/applications/science/math/sage/sagelib.nix index 0a2bd8011b0bd..1552de773d014 100644 --- a/pkgs/applications/science/math/sage/sagelib.nix +++ b/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/pkgs/applications/science/misc/snakemake/default.nix b/pkgs/applications/science/misc/snakemake/default.nix index 3f5567be03d54..bc69b0947e087 100644 --- a/pkgs/applications/science/misc/snakemake/default.nix +++ b/pkgs/applications/science/misc/snakemake/default.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "snakemake"; - version = "8.11.2"; + version = "8.11.3"; format = "setuptools"; src = fetchFromGitHub { owner = "snakemake"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-rIA757FIIkb6h/QNzyVbIbipkZTwysNonHrPHLqFOyI="; + hash = "sha256-wNs5OW8bM5LU0Ik77VU47dEq2PlrsfNNtl6Zedocnm4="; # 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/pkgs/applications/system/asusctl/Cargo.lock b/pkgs/applications/system/asusctl/Cargo.lock index 65c286d0219e5..b7658ab895d4e 100644 --- a/pkgs/applications/system/asusctl/Cargo.lock +++ b/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", @@ -19,75 +19,6 @@ 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" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -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 = "allocator-api2" +version = "0.2.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f" + +[[package]] name = "android-activity" -version = "0.4.3" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64529721f27c2314ced0890ce45e469574a73e5e6fdd6e9da1860eb29285f5e0" +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]] @@ -163,29 +104,6 @@ dependencies = [ ] [[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" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -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", ] @@ -323,6 +240,17 @@ dependencies = [ ] [[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" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -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" -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" +name = "auto_enums" +version = "0.8.5" 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" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" - -[[package]] -name = "az" -version = "1.2.1" +version = "1.3.0" 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,26 +449,60 @@ 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 = "betrayer" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88df312fbb13c845a05ede7e91ab7b9fea442d9176d092bbdb954ae6db55ad5d" +dependencies = [ + "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.2" +version = "0.69.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4c69fae65a523209d34240b60abe0c42d33d1045d445c0839d8a4894a736e2d" +checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0" dependencies = [ - "bitflags 2.4.2", + "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" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -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" +checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" [[package]] -name = "cairo-rs" -version = "0.16.7" +name = "calloop" +version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3125b15ec28b84c238f6f476c6034016a5f6cc0221cb514ca46c532139fc97d" +checksum = "fba7adb4dd5aa98e5553510223000e7148f621165ec5f9acd7113f6ca4995298" dependencies = [ - "bitflags 1.3.2", - "cairo-sys-rs", - "glib", - "libc", - "once_cell", + "bitflags 2.5.0", + "log", + "polling 3.7.0", + "rustix 0.38.34", + "slab", "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", -] - -[[package]] -name = "calloop" -version = "0.10.6" +name = "calloop-wayland-source" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52e0d00eb1ea24371a97d2da6201c6747a633dc6dc1988ef503403b4c59504a8" +checksum = "0f0ea9b9476c7fad82841a8dbb380e2eae480c21910feba80725b46931ed8f02" dependencies = [ - "bitflags 1.3.2", - "log", - "nix 0.25.1", - "slotmap", - "thiserror", - "vec_map", + "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]] @@ -745,16 +678,6 @@ dependencies = [ ] [[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" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -767,6 +690,12 @@ 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" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -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,20 +726,72 @@ 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" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -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", @@ -899,8 +915,26 @@ dependencies = [ ] [[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,20 +947,51 @@ 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" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -937,6 +1002,27 @@ dependencies = [ ] [[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" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -957,6 +1043,30 @@ dependencies = [ ] [[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" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -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" - -[[package]] -name = "ecolor" -version = "0.21.0" -source = "git+https://github.com/emilk/egui?rev=b8e798777de519de3a1878798097ab2ab0bd4def#b8e798777de519de3a1878798097ab2ab0bd4def" -dependencies = [ - "bytemuck", -] +checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2" [[package]] -name = "eframe" -version = "0.21.3" -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", - "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-ffi", + "drm-fourcc", + "nix 0.26.4", ] [[package]] -name = "egui" -version = "0.21.0" -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 = [ - "accesskit", - "ahash", - "epaint", - "log", - "nohash-hasher", + "drm-sys", + "nix 0.26.4", ] [[package]] -name = "egui-winit" -version = "0.21.1" -source = "git+https://github.com/emilk/egui?rev=b8e798777de519de3a1878798097ab2ab0bd4def#b8e798777de519de3a1878798097ab2ab0bd4def" -dependencies = [ - "accesskit_winit", - "arboard", - "egui", - "instant", - "log", - "smithay-clipboard", - "webbrowser", - "winit", -] +name = "drm-fourcc" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0aafbcdb8afc29c1a7ee5fbe53b5d62f4565b35a042a662ca9fecd0b54dae6f4" [[package]] -name = "egui_glow" -version = "0.21.0" -source = "git+https://github.com/emilk/egui?rev=b8e798777de519de3a1878798097ab2ab0bd4def#b8e798777de519de3a1878798097ab2ab0bd4def" +name = "drm-sys" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1369f1679d6b706d234c4c1e0613c415c2c74b598a09ad28080ba2474b72e42d" dependencies = [ - "bytemuck", - "egui", - "glow", - "log", - "memoffset 0.6.5", - "wasm-bindgen", - "web-sys", + "libc", ] [[package]] -name = "either" -version = "1.9.0" +name = "dwrote" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" - -[[package]] -name = "emath" -version = "0.21.0" -source = "git+https://github.com/emilk/egui?rev=b8e798777de519de3a1878798097ab2ab0bd4def#b8e798777de519de3a1878798097ab2ab0bd4def" +checksum = "439a1c2ba5611ad3ed731280541d36d2e9c4ac5e7fb818a27b604bdc5a6aa65b" dependencies = [ - "bytemuck", + "lazy_static", + "libc", + "serde", + "serde_derive", + "winapi", + "wio", ] [[package]] -name = "embedded-graphics" -version = "0.7.1" +name = "either" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "750082c65094fbcc4baf9ba31583ce9a8bb7f52cadfb96f6164b1bc7f922f32b" -dependencies = [ - "az", - "byteorder", - "embedded-graphics-core", - "float-cmp", - "micromath", -] +checksum = "a47c1c47d2f5964e29c61246e81db715514cd532db6b5116a25ea3c03d6780a2" [[package]] -name = "embedded-graphics-core" -version = "0.3.3" +name = "endi" +version = "1.1.0" 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]] @@ -1180,22 +1245,6 @@ dependencies = [ ] [[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" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -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]] @@ -1250,6 +1298,17 @@ dependencies = [ ] [[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" @@ -1260,6 +1319,32 @@ dependencies = [ ] [[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" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -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" @@ -1284,48 +1369,142 @@ dependencies = [ ] [[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 = "filetime" +version = "0.2.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall 0.4.1", + "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 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-macros" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.61", +] + +[[package]] name = "foreign-types-shared" -version = "0.1.1" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" +checksum = "aa9a19cbb55df58761df49b23516a86d432839add4af60fc256da840f66ed35b" [[package]] name = "form_urlencoded" @@ -1337,32 +1516,12 @@ dependencies = [ ] [[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" @@ -1385,11 +1544,11 @@ 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", @@ -1397,17 +1556,6 @@ dependencies = [ ] [[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" @@ -1427,7 +1575,6 @@ checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" dependencies = [ "futures-core", "futures-io", - "futures-macro", "futures-sink", "futures-task", "memchr", @@ -1437,100 +1584,85 @@ 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", + "drm", + "drm-fourcc", + "gbm-sys", "libc", - "pango", ] [[package]] -name = "gdk-pixbuf" -version = "0.16.7" +name = "gbm-sys" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3578c60dee9d029ad86593ed88cb40f35c1b83360e12498d055022385dd9a05" +checksum = "b63eba9b9b7a231514482deb08759301c9f9f049ac6869403f381834ebfeaf67" dependencies = [ - "bitflags 1.3.2", - "gdk-pixbuf-sys", - "gio", - "glib", "libc", ] [[package]] -name = "gdk-pixbuf-sys" -version = "0.16.3" +name = "generic-array" +version = "0.14.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3092cf797a5f1210479ea38070d9ae8a5b8e9f8f1be9f32f4643c529c7d70016" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" dependencies = [ - "gio-sys", - "glib-sys", - "gobject-sys", - "libc", - "system-deps", + "typenum", + "version_check", ] [[package]] -name = "gdk-sys" -version = "0.16.0" +name = "getrandom" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d76354f97a913e55b984759a997b693aa7dc71068c9e98bcce51aa167a0a5c5a" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ - "cairo-sys-rs", - "gdk-pixbuf-sys", - "gio-sys", - "glib-sys", - "gobject-sys", + "cfg-if", + "js-sys", "libc", - "pango-sys", - "pkg-config", - "system-deps", + "wasi", + "wasm-bindgen", ] [[package]] -name = "generic-array" -version = "0.14.7" +name = "gettext-rs" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" +checksum = "e49ea8a8fad198aaa1f9655a2524b64b70eb06b2f3ff37da407566c93054f364" dependencies = [ - "typenum", - "version_check", + "gettext-sys", + "locale_config", ] [[package]] -name = "gethostname" -version = "0.3.0" +name = "gettext-sys" +version = "0.21.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb65d4ba3173c56a500b555b532f72c42e8d1fe64962b518897f8959fae2c177" +checksum = "c63ce2e00f56a206778276704bbe38564c8695249fdc8f354b4ef71c57c3839d" dependencies = [ - "libc", - "winapi", + "cc", + "temp-dir", ] [[package]] -name = "getrandom" -version = "0.2.12" +name = "gif" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" +checksum = "80792593675e051cf94a4b111980da2ba60d4a83e43e0048c5693baab3977045" dependencies = [ - "cfg-if", - "libc", - "wasi", + "color_quant", + "weezl", ] [[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", @@ -1543,39 +1675,6 @@ 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" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1596,53 +1695,6 @@ dependencies = [ ] [[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" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -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,135 +1714,58 @@ 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" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af784eb26c5a68ec85391268e074f0aa618c096eadb5d6330b0911cf34fe57c5" -dependencies = [ - "gl_generator", - "windows-sys 0.45.0", -] - -[[package]] -name = "glutin_glx_sys" -version = "0.4.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b53cb5fe568964aa066a3ba91eac5ecbac869fb0842cd0dc9e412434f1a1494" +checksum = "77cc5623f5309ef433c3dd4ca1223195347fe62c413da8e2fdd0eb76db2d9bcd" 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" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1811,10 +1786,24 @@ dependencies = [ ] [[package]] +name = "half" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6dd08c532ae367adf81c312a4580bc67f1d0fe8bc9c460520283f4c0ff277888" +dependencies = [ + "cfg-if", + "crunchy", +] + +[[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" @@ -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" @@ -1850,10 +1839,228 @@ 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", @@ -1873,6 +2080,27 @@ dependencies = [ ] [[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" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1883,10 +2111,40 @@ dependencies = [ ] [[package]] +name = "image" +version = "0.24.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5690139d2f55868e080017335e4b94cb7414274c74f1669c84fb5feba2c9f69d" +dependencies = [ + "bytemuck", + "byteorder", + "color_quant", + "exr", + "gif 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.1.0" +version = "2.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" +checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" dependencies = [ "equivalent", "hashbrown", @@ -1915,15 +2173,41 @@ dependencies = [ ] [[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" 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 = "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.61" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730" +checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" dependencies = [ "wasm-bindgen", ] @@ -2010,6 +2303,22 @@ 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" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2022,65 +2331,72 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] -name = "libappindicator" -version = "0.8.0" -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" +name = "lebe" +version = "0.5.2" 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 = "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 = "libredox" -version = "0.0.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3af92c55d7d839293953fcd0fda5ecfe93297cfde6ffbdec13b41d99c0ba6607" +checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "libc", - "redox_syscall 0.4.1", +] + +[[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]] @@ -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", @@ -2106,6 +2422,21 @@ dependencies = [ ] [[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" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2118,10 +2449,23 @@ 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" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" +checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" dependencies = [ "autocfg", "scopeguard", @@ -2129,21 +2473,68 @@ 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" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2167,53 +2558,53 @@ 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 = "memoffset" -version = "0.6.5" +name = "memmap2" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" +checksum = "fe751422e4a8caa417e13c3ea66452215d7d63e19e604f4980461212f3ae1322" dependencies = [ - "autocfg", + "libc", ] [[package]] name = "memoffset" -version = "0.7.1" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" +checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" dependencies = [ "autocfg", ] [[package]] -name = "memoffset" -version = "0.9.0" +name = "metal" +version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" +checksum = "c43f73953f8cbe511f021b58f18c3ce1c3d1ae13fe953293e13345bf83217f25" dependencies = [ - "autocfg", + "bitflags 2.5.0", + "block", + "core-graphics-types", + "foreign-types", + "log", + "objc", + "paste", ] [[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" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -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,58 +2674,49 @@ 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" +version = "0.26.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069" +checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" dependencies = [ "bitflags 1.3.2", "cfg-if", "libc", - "memoffset 0.6.5", ] [[package]] name = "nix" -version = "0.25.1" +version = "0.27.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f346ff70e7dbfd675fe90590b92d59ef2de15a8779ae305ebcbfd3f0caf59be4" +checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053" dependencies = [ - "autocfg", - "bitflags 1.3.2", + "bitflags 2.5.0", "cfg-if", "libc", - "memoffset 0.6.5", ] [[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 0.1.1", "libc", - "memoffset 0.7.1", - "pin-utils", + "memoffset", ] [[package]] -name = "nohash-hasher" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bf50223579dc7cdcfb3bfcacf7069ff68243f8c363f62ffa99cf000a6b9c451" - -[[package]] name = "nom" version = "7.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -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-conv" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" + +[[package]] name = "num-traits" -version = "0.2.17" +version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" +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", -] - -[[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", - "proc-macro2", - "quote", - "syn 1.0.109", + "num_enum_derive", ] [[package]] name = "num_enum_derive" -version = "0.6.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96667db765a921f7b295ffee8b60472b686a51d4f21c2ee4ffdb94c7013b65a6" +checksum = "681030a937600a36906c185595136d26abfebb4aa9c65701cefcaf8578bb982b" 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-encode" -version = "2.0.0-pre.2" +name = "objc2" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abfcac41015b00a120608fdaa6938c44cb983fee294351cc4bac7638b4e50512" +checksum = "b4b25e1034d0e636cd84707ccdaa9f81243d399196b8a773946dcffec0401659" dependencies = [ "objc-sys", + "objc2-encode 4.0.1", +] + +[[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.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 = [ + "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" @@ -2505,32 +2909,6 @@ dependencies = [ ] [[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" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -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 = "pico-args" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +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.13" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" +checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" [[package]] name = "pin-utils" @@ -2590,13 +2988,19 @@ 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" 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,19 +3057,29 @@ 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" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2678,46 +3092,40 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] -name = "proc-macro-crate" -version = "1.3.1" +name = "prettyplease" +version = "0.2.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" +checksum = "5f12335488a2f3b0a83b14edad48dca9879ce89b2edd10e80237e4e852dd645e" dependencies = [ - "once_cell", - "toml_edit 0.19.15", + "proc-macro2", + "syn 2.0.61", ] [[package]] -name = "proc-macro-error" -version = "1.0.4" +name = "proc-macro-crate" +version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" +checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" dependencies = [ - "proc-macro-error-attr", - "proc-macro2", - "quote", - "syn 1.0.109", - "version_check", + "toml_edit 0.21.1", ] [[package]] -name = "proc-macro-error-attr" -version = "1.0.4" +name = "proc-macro2" +version = "1.0.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" +checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b" dependencies = [ - "proc-macro2", - "quote", - "version_check", + "unicode-ident", ] [[package]] -name = "proc-macro2" -version = "1.0.78" +name = "qoi" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" +checksum = "7f6d64c71eb498fe9eae14ce4ec935c555749aef511cca85b5568910d6e48001" dependencies = [ - "unicode-ident", + "bytemuck", ] [[package]] @@ -2730,10 +3138,19 @@ dependencies = [ ] [[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" +version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" dependencies = [ "proc-macro2", ] @@ -2775,6 +3192,32 @@ 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" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2793,21 +3236,30 @@ dependencies = [ ] [[package]] +name = "redox_syscall" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "469052894dcb553421e483e4209ee581a45100d31b4018de03e5a7ad86374a7e" +dependencies = [ + "bitflags 2.5.0", +] + +[[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 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,15 +3409,14 @@ 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", @@ -2952,22 +3424,53 @@ dependencies = [ ] [[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 = "rowan" +version = "0.15.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +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.3" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45fff149b6033f25e825cbb7b2c625a11ee8e6dac09264d49beb125e39aa97bf" +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" @@ -3043,6 +3568,12 @@ 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" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -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", ] @@ -3174,6 +3705,50 @@ 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" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3183,6 +3758,44 @@ dependencies = [ ] [[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" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -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,16 +3854,25 @@ 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" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -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 = "static_assertions" -version = "1.1.0" +name = "spin" +version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" +dependencies = [ + "lock_api", +] [[package]] -name = "str-buf" -version = "1.0.6" +name = "spin_on" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e08d8363704e6c71fc928674353e6b7c23dcea9d82d7012c8faf2a3a025f8d0" +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 = "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,11 +3991,21 @@ 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" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -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", -] - -[[package]] -name = "systemd-zbus" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffbb1b6ea6d96b14a7e94532711efc4106337fe8b1d6bdf8ba5318012a9fa7e3" -dependencies = [ - "serde", - "zbus", + "filetime", + "libc", + "xattr", ] [[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 = "temp-dir" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f227968ec00f0e5322f9b8173c7a0cbcff6181a0a5b28e9892491c286277231" + +[[package]] name = "tempfile" -version = "3.9.0" +version = "3.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01ce4141aa927a6d1bd34a041795abd0db1cccba5d5f24b009f694bdf3a1f3fa" +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 = "text-size" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f18aa187839b2bdb1ad2fa35ead8c4c2976b64e4363c386d45ac0f7ee85c9233" + +[[package]] name = "thiserror" -version = "1.0.56" +version = "1.0.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d54378c645627613241d077a3a79db965db602882668f9136ac42af9ecb730ad" +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,23 +4133,24 @@ 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", @@ -3443,15 +4158,6 @@ dependencies = [ ] [[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" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -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" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" -dependencies = [ - "serde", -] - -[[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]] @@ -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]] @@ -3624,21 +4321,34 @@ dependencies = [ ] [[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", @@ -3661,21 +4371,63 @@ 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" 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.22" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" +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" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3687,16 +4439,37 @@ dependencies = [ ] [[package]] -name = "vcpkg" -version = "0.2.15" +name = "usvg" +version = "0.41.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" +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 = "vec_map" -version = "0.8.2" +name = "vcpkg" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" +checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" [[package]] name = "version-compare" @@ -3712,15 +4485,36 @@ 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" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -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", + "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.5.0", + "rustix 0.38.34", + "wayland-backend", "wayland-scanner", - "wayland-sys 0.29.5", ] [[package]] -name = "wayland-commons" -version = "0.29.5" +name = "wayland-csd-frame" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8691f134d584a33a6606d9d717b95c4fa20065605f798a3f350d78dced02a902" +checksum = "625c5029dbd43d25e6aa9615e88b829a5cad13b2819c4ae129fdbb7c31ab4c7e" dependencies = [ - "nix 0.24.3", - "once_cell", - "smallvec", - "wayland-sys 0.29.5", + "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", + "log", + "once_cell", "pkg-config", ] [[package]] -name = "wayland-sys" -version = "0.30.1" +name = "web-sys" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96b2a02ac608e07132978689a6f9bf4214949c85998c247abadd4f4129b1aa06" +checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" dependencies = [ - "dlib", - "lazy_static", - "log", - "pkg-config", + "js-sys", + "wasm-bindgen", ] [[package]] -name = "web-sys" -version = "0.3.61" +name = "web-time" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e33b99f4b23ba3eec1a53ac264e35a755f00e966e0065077d6027c0f575b0b97" +checksum = "aa30049b1c872b72c89866d458eae9f20380ab280ffd1b1e18df2d3e2d98cfe0" dependencies = [ "js-sys", "wasm-bindgen", ] [[package]] -name = "webbrowser" -version = "0.8.12" +name = "web-time" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82b2391658b02c27719fc5a0a73d6e696285138e8b12fba9d4baa70451023c71" +checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb" dependencies = [ - "core-foundation", - "home", - "jni", - "log", - "ndk-context", - "objc", - "raw-window-handle", - "url", - "web-sys", + "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" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" -dependencies = [ - "winapi", -] - -[[package]] -name = "winapi-wsapoll" -version = "0.1.1" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44c17110f57155602a80dca10be03852116403c9ff3cd25b079d666f2aa3df6e" +checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b" dependencies = [ - "winapi", + "windows-sys 0.52.0", ] [[package]] @@ -3968,23 +4792,32 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windows" -version = "0.44.0" +version = "0.51.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e745dab35a0c4c77aa3ce42d595e13d2003d6902d6b08c9ef5fc326d08da12b" +checksum = "ca229916c5ee38c2f2bc1e9d8f04df975b4bd93f9955dc69fabb5d91270045c9" dependencies = [ - "windows-implement", - "windows-interface", - "windows-targets 0.42.2", + "windows-core 0.51.1", + "windows-targets 0.48.5", ] [[package]] name = "windows" -version = "0.51.1" +version = "0.54.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca229916c5ee38c2f2bc1e9d8f04df975b4bd93f9955dc69fabb5d91270045c9" +checksum = "9252e5725dbed82865af151df558e754e4a3c2c30818359eb17465f1346a1b49" dependencies = [ - "windows-core 0.51.1", - "windows-targets 0.48.5", + "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]] @@ -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 = [ - "libc", - "once_cell", - "pkg-config", + "memchr", ] [[package]] -name = "x11rb" -version = "0.12.0" +name = "wio" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1641b26d4dec61337c35a1b1aaf9e3cba8f46f0b43636c609ab0291a648040a" +checksum = "5d129932f4644ac2396cb456385cbf9e63b5b30c6e8dc4820bdca4eb082037a5" dependencies = [ - "gethostname", - "nix 0.26.4", "winapi", - "winapi-wsapoll", - "x11rb-protocol", ] [[package]] -name = "x11rb-protocol" -version = "0.12.0" +name = "xattr" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82d6c3f9a0fb6701fab8f6cea9b0c0bd5d6876f1f89f7fada07e558077c344bc" +checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f" dependencies = [ - "nix 0.26.4", + "libc", + "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 = "xkbcommon" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +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.19" +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 = "0fcb9cbac069e033553e8bb871be2fbdffcab578eb25bd0f7c508cedc6dcd75a" +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/pkgs/applications/system/asusctl/default.nix b/pkgs/applications/system/asusctl/default.nix index ba18d23889018..53628433a0f92 100644 --- a/pkgs/applications/system/asusctl/default.nix +++ b/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 = [ + fontconfig + libGL + libinput + libxkbcommon + mesa + seatd + systemd + wayland + ]; - buildInputs = [ systemd fontconfig gtk3 ]; + # 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/pkgs/applications/terminal-emulators/terminator/default.nix b/pkgs/applications/terminal-emulators/terminator/default.nix index 3eb374af71abb..175d3766594b7 100644 --- a/pkgs/applications/terminal-emulators/terminator/default.nix +++ b/pkgs/applications/terminal-emulators/terminator/default.nix @@ -7,6 +7,7 @@ , gtk3 , gobject-introspection , libnotify +, makeBinaryWrapper , wrapGAppsHook3 , vte , nixosTests @@ -27,6 +28,7 @@ python3.pkgs.buildPythonApplication rec { file intltool gobject-introspection + 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/pkgs/applications/version-management/tig/default.nix b/pkgs/applications/version-management/tig/default.nix index d7bd912b44d5a..b4a8533d468ee 100644 --- a/pkgs/applications/version-management/tig/default.nix +++ b/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/pkgs/applications/video/haruna/default.nix b/pkgs/applications/video/haruna/default.nix index 273b26808af58..7409bb8470741 100644 --- a/pkgs/applications/video/haruna/default.nix +++ b/pkgs/applications/video/haruna/default.nix @@ -25,13 +25,13 @@ 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"; }; diff --git a/pkgs/applications/video/rtabmap/default.nix b/pkgs/applications/video/rtabmap/default.nix index b44389045187c..6d5270d344ea3 100644 --- a/pkgs/applications/video/rtabmap/default.nix +++ b/pkgs/applications/video/rtabmap/default.nix @@ -27,13 +27,13 @@ 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 wrapGAppsHook3 ]; diff --git a/pkgs/applications/video/vdr/softhddevice/default.nix b/pkgs/applications/video/vdr/softhddevice/default.nix index caccdc6ed39a8..9271a9bf70640 100644 --- a/pkgs/applications/video/vdr/softhddevice/default.nix +++ b/pkgs/applications/video/vdr/softhddevice/default.nix @@ -14,12 +14,12 @@ }: stdenv.mkDerivation rec { pname = "vdr-softhddevice"; - version = "2.2.0"; + version = "2.3.0"; src = fetchFromGitHub { owner = "ua0lnj"; repo = "vdr-plugin-softhddevice"; - sha256 = "sha256-1yCDNfUdQLgJ0WWyx0q3Hi0yxb6zxaK7wMzLD9jXweI="; + sha256 = "sha256-qyl4XDLJ99QXQY0XXYMteja0oWZ+vkFa4RwEo1Hv3bo="; rev = "v${version}"; }; diff --git a/pkgs/applications/virtualization/podman-tui/default.nix b/pkgs/applications/virtualization/podman-tui/default.nix index 8e035b87533bd..58ae746bf7536 100644 --- a/pkgs/applications/virtualization/podman-tui/default.nix +++ b/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; diff --git a/pkgs/applications/virtualization/tart/default.nix b/pkgs/applications/virtualization/tart/default.nix index e8791404fb875..921a8b7e3dbc9 100644 --- a/pkgs/applications/virtualization/tart/default.nix +++ b/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/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index 3b0783a1509b5..b09736d3138c6 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -251,7 +251,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) '' diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions-iso/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions-iso/default.nix index d2f9bc62ba18b..cd2f58afc92a6 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions-iso/default.nix +++ b/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/pkgs/applications/window-managers/hyprwm/hyprland/default.nix b/pkgs/applications/window-managers/hyprwm/hyprland/default.nix index 4d50b39ebedad..88fe9c31f0456 100644 --- a/pkgs/applications/window-managers/hyprwm/hyprland/default.nix +++ b/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,24 +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.39.1"; src = fetchFromGitHub { owner = "hyprwm"; repo = finalAttrs.pname; + fetchSubmodules = true; rev = "v${finalAttrs.version}"; - hash = "sha256-Urb/njWiHYUudXpmK8EKl9Z58esTIG0PxXw5LuM2r5g="; + 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 @@ -69,12 +67,12 @@ 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-16" \ - --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 = [ @@ -89,6 +87,8 @@ stdenv.mkDerivation (finalAttrs: { ninja pkg-config wayland-scanner + cmake # for subproject udis86 + python3 ]; outputs = [ @@ -97,36 +97,40 @@ stdenv.mkDerivation (finalAttrs: { "dev" ]; - buildInputs = - wlr.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 + hwdata + 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) @@ -135,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]} @@ -150,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/pkgs/applications/window-managers/hyprwm/hyprland/udis86.nix b/pkgs/applications/window-managers/hyprwm/hyprland/udis86.nix deleted file mode 100644 index b72083c4560a1..0000000000000 --- a/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/pkgs/applications/window-managers/hyprwm/hyprland/wlroots.nix b/pkgs/applications/window-managers/hyprwm/hyprland/wlroots.nix deleted file mode 100644 index b2f4a52126dcf..0000000000000 --- a/pkgs/applications/window-managers/hyprwm/hyprland/wlroots.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ fetchFromGitHub -, wlroots -, enableXWayland ? true -}: -wlroots.overrideAttrs - (old: { - inherit enableXWayland; - version = "0.18.0-dev"; - - src = fetchFromGitHub { - owner = "hyprwm"; - repo = "wlroots-hyprland"; - rev = "611a4f24cd2384378f6e500253983107c6656c64"; - hash = "sha256-vPeZCY+sdiGsz4fl3AVVujfyZyQBz6+vZdkUE4hQ+HI="; - }; - - patches = [ ]; # don't inherit old.patches - - pname = "${old.pname}-hyprland"; - }) diff --git a/pkgs/build-support/lib/meson.nix b/pkgs/build-support/lib/meson.nix index 456c10fcb8eeb..9ffc5b8c1710f 100644 --- a/pkgs/build-support/lib/meson.nix +++ b/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/pkgs/build-support/rust/replace-workspace-values.py b/pkgs/build-support/rust/replace-workspace-values.py index 2b88f1fa79bbe..003023ff2560a 100644 --- a/pkgs/build-support/rust/replace-workspace-values.py +++ b/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/pkgs/by-name/af/affine/package.nix b/pkgs/by-name/af/affine/package.nix index d484bc94e5667..ae55ffad9800c 100644 --- a/pkgs/by-name/af/affine/package.nix +++ b/pkgs/by-name/af/affine/package.nix @@ -18,10 +18,10 @@ stdenvNoCC.mkDerivation (finalAttrs: let }; in { pname = "affine"; - version = "0.13.3"; + 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-w/5X7PFLHVILg1XCYkGefBQ4c+Ko+ME0Lu8iAtCaTFg="; + hash = "sha256-/dKvRr0cH9mLF1y6FGFRDlsFXaymEmb55AZ37Ti0PU4="; }; nativeBuildInputs = [ copyDesktopItems diff --git a/pkgs/by-name/al/alephone-durandal/package.nix b/pkgs/by-name/al/alephone-durandal/package.nix index d8376457f6441..b1bd2da8c8a36 100644 --- a/pkgs/by-name/al/alephone-durandal/package.nix +++ b/pkgs/by-name/al/alephone-durandal/package.nix @@ -3,13 +3,13 @@ alephone.makeWrapper rec { pname = "durandal"; desktopName = "Marathon-Durandal"; - version = "20240119"; + 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-Tp9EWMIY0moK6RLIpxB7rMzLOQ7zPfV58oeAyQsTbnM="; + sha256 = "sha256-uoBl1/7XlXmMLqpk3tvme9w18q4Yh0WCrmqSzjGxNz0="; }; meta = { diff --git a/pkgs/by-name/al/alephone-infinity/package.nix b/pkgs/by-name/al/alephone-infinity/package.nix index 466f3bb7d4b65..d2ba3968f5959 100644 --- a/pkgs/by-name/al/alephone-infinity/package.nix +++ b/pkgs/by-name/al/alephone-infinity/package.nix @@ -3,13 +3,13 @@ alephone.makeWrapper rec { pname = "marathon-infinity"; desktopName = "Marathon-Infinity"; - version = "20240119"; + 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-KfFu+cboaZMfjnu3W84/Qbcrc9kbkIZ2Y0GM1fXeXh8="; + sha256 = "sha256-+FPym4Avqzyo4cZtfYPHXCS+q21+g9AIdKOImkd/UjU="; }; meta = { diff --git a/pkgs/by-name/al/alephone-marathon/package.nix b/pkgs/by-name/al/alephone-marathon/package.nix index 38018ec021b05..4710d47090d5b 100644 --- a/pkgs/by-name/al/alephone-marathon/package.nix +++ b/pkgs/by-name/al/alephone-marathon/package.nix @@ -3,13 +3,13 @@ alephone.makeWrapper rec { pname = "marathon"; desktopName = "Marathon"; - version = "20240119"; + 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-60+dvXyzHe5PDepyKHcEIdWoRiGMvx5zYehubWKqaB0="; + sha256 = "sha256-shZ82e7veaaT/petxDQ8Fd7YtJPmTgxSCStf0kGfrFs="; }; meta = { diff --git a/pkgs/by-name/ar/arc-browser/package.nix b/pkgs/by-name/ar/arc-browser/package.nix index 094249825dd65..4f8a22e89bb9e 100644 --- a/pkgs/by-name/ar/arc-browser/package.nix +++ b/pkgs/by-name/ar/arc-browser/package.nix @@ -9,11 +9,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "arc-browser"; - version = "1.41.0-49440"; + version = "1.42.0-49714"; src = fetchurl { url = "https://releases.arc.net/release/Arc-${finalAttrs.version}.dmg"; - hash = "sha256-+3XK94LX2UBof7cUpVzc4DTyp9xMH2v5n7LQD4gdANA="; + hash = "sha256-fPb4g9rGJqeXuO2ytSo/8r0RB/h/EYa763JAFNqIPY8="; }; nativeBuildInputs = [ undmg ]; diff --git a/pkgs/by-name/ar/arduino-ide/package.nix b/pkgs/by-name/ar/arduino-ide/package.nix index 68e873fc28652..7184705a178a8 100644 --- a/pkgs/by-name/ar/arduino-ide/package.nix +++ b/pkgs/by-name/ar/arduino-ide/package.nix @@ -20,6 +20,7 @@ appimageTools.wrapType2 { extraInstallCommands = '' 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 ]; diff --git a/pkgs/by-name/bl/blockbench/package.nix b/pkgs/by-name/bl/blockbench/package.nix index fb19793583c43..e7f019244e19f 100644 --- a/pkgs/by-name/bl/blockbench/package.nix +++ b/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/pkgs/by-name/br/bruno/package.nix b/pkgs/by-name/br/bruno/package.nix index 0c7221679a88c..3e9cf6b51fdcf 100644 --- a/pkgs/by-name/br/bruno/package.nix +++ b/pkgs/by-name/br/bruno/package.nix @@ -27,20 +27,20 @@ let in buildNpmPackage' rec { pname = "bruno"; - version = "1.16.1"; + version = "1.17.0"; src = fetchFromGitHub { owner = "usebruno"; repo = "bruno"; rev = "v${version}"; - hash = "sha256-rP3PHS6kuJCgbCQy4h+bJksmJAJvHDBMSysLM5FxQjk="; + hash = "sha256-z4KL6CX1jtuC4lxqYA6Mg1zPSc9/OpRb530jPIQK3Is="; postFetch = '' ${lib.getExe npm-lockfile-fix} $out/package-lock.json ''; }; - npmDepsHash = "sha256-p4rBEOK9zKGO1q3SCKpfdX3EPMkYHRvn9UnGBhsksSE="; + npmDepsHash = "sha256-NIf7aMDAeE39+putw/7GTYODIdVmjJIvIwnL5O+sBmI="; npmFlags = [ "--legacy-peer-deps" ]; nativeBuildInputs = [ diff --git a/pkgs/by-name/bu/bugstalker/package.nix b/pkgs/by-name/bu/bugstalker/package.nix new file mode 100644 index 0000000000000..ccbf397e71d93 --- /dev/null +++ b/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/pkgs/by-name/c2/c2fmzq/package.nix b/pkgs/by-name/c2/c2fmzq/package.nix index f5249425f8050..1ac91956bd269 100644 --- a/pkgs/by-name/c2/c2fmzq/package.nix +++ b/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/pkgs/servers/caddy/default.nix b/pkgs/by-name/ca/caddy/package.nix index 399ce426d9dc6..73ab67366483b 100644 --- a/pkgs/servers/caddy/default.nix +++ b/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/pkgs/by-name/ca/caligula/package.nix b/pkgs/by-name/ca/caligula/package.nix new file mode 100644 index 0000000000000..f0f5c14664fc1 --- /dev/null +++ b/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/pkgs/by-name/ca/cargo-bloat/package.nix b/pkgs/by-name/ca/cargo-bloat/package.nix index b0026988c9a16..4c77fbbb384ce 100644 --- a/pkgs/by-name/ca/cargo-bloat/package.nix +++ b/pkgs/by-name/ca/cargo-bloat/package.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-bloat"; - version = "0.12.0"; + version = "0.12.1"; src = fetchFromGitHub { owner = "RazrFalcon"; repo = pname; rev = "v${version}"; - hash = "sha256-vPk6ERl0VM1TjK/JRMcXqCvKqSTuw78MsmQ0xImQyd4="; + hash = "sha256-B71VX7cJe1giOLmk3cQE8Zxr7fKGyQkoXRuM+NzBcb8="; }; - cargoHash = "sha256-6fMFGLH16Z1O+ETlr0685TXHup1vJetfzPdNC2Lw9uM="; + 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/pkgs/by-name/ca/cargo-geiger/allow-warnings.patch b/pkgs/by-name/ca/cargo-geiger/allow-warnings.patch new file mode 100644 index 0000000000000..97a9090e904d0 --- /dev/null +++ b/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/pkgs/development/tools/rust/cargo-geiger/default.nix b/pkgs/by-name/ca/cargo-geiger/package.nix index 3fbf1af9ad46d..ac3338a68a4bb 100644 --- a/pkgs/development/tools/rust/cargo-geiger/default.nix +++ b/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/pkgs/by-name/ca/catppuccin-sddm/package.nix b/pkgs/by-name/ca/catppuccin-sddm/package.nix new file mode 100644 index 0000000000000..1daab09ae646d --- /dev/null +++ b/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/pkgs/development/tools/misc/cli11/default.nix b/pkgs/by-name/cl/cli11/package.nix index 8c4c58c052b0b..d88470fa4d510 100644 --- a/pkgs/development/tools/misc/cli11/default.nix +++ b/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/pkgs/development/libraries/coost/default.nix b/pkgs/by-name/co/coost/package.nix index 7a259d44faf05..648d0f9f4db3a 100644 --- a/pkgs/development/libraries/coost/default.nix +++ b/pkgs/by-name/co/coost/package.nix @@ -10,15 +10,15 @@ 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 = '' @@ -34,6 +34,7 @@ stdenv.mkDerivation rec { "-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; { @@ -43,4 +44,4 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.sigmanificient ]; platforms = platforms.unix; }; -} +}) diff --git a/pkgs/by-name/co/coppwr/Cargo.lock b/pkgs/by-name/co/coppwr/Cargo.lock index b4bcd405212ab..c1be56da8ccb2 100644 --- a/pkgs/by-name/co/coppwr/Cargo.lock +++ b/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 = "allocator-api2" +version = "0.2.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f" + +[[package]] name = "android-activity" -version = "0.4.3" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64529721f27c2314ced0890ce45e469574a73e5e6fdd6e9da1860eb29285f5e0" +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 = "android_system_properties" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +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.75" +version = "1.0.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" +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 = "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.7" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c018490e423efb6f032ef575f873ea57b61d44bec763cfe027b8e8852a027cf" +checksum = "01992ad7774250d5b7fe214e2676cb99bf92564436d8135ab44fe815e71769a9" dependencies = [ - "async-std", + "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" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35" -dependencies = [ - "concurrent-queue", - "event-listener 2.5.3", - "futures-core", -] - -[[package]] -name = "async-channel" -version = "2.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.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,16 +349,33 @@ 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" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -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,64 +446,101 @@ 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 = [ + "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 = [ - "async-recursion", - "async-trait", - "atspi-macros", "enumflags2", - "futures-lite 1.13.0", "serde", - "tracing", + "static_assertions", "zbus", "zbus_names", + "zvariant", ] [[package]] -name = "atspi-macros" -version = "0.2.0" +name = "atspi-connection" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97fb4870a32c0eaa17e35bca0e6b16020635157121fb7d45593d242c295bc768" +checksum = "a0c65e7d70f86d4c0e3b2d585d9bf3f979f0b19d635a336725a88d279f76b939" dependencies = [ - "quote", - "syn 1.0.109", + "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" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -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", @@ -710,16 +803,57 @@ dependencies = [ ] [[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" +version = "4.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35ed6e9d84f0b51a7f52daf1c7d71dd136fd7a3f41a8462b8cdb8c78d920fad4" +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,32 +943,48 @@ 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" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -841,6 +995,12 @@ dependencies = [ ] [[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" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -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-wgpu" +version = "0.27.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "469ff65843f88a702b731a1532b7d03b0e8e96d283e70f3a22b0e06c46cb9b37" +dependencies = [ + "bytemuck", + "document-features", + "egui", + "epaint", + "log", + "thiserror", + "type-map", + "web-time", + "wgpu", + "winit", +] + +[[package]] name = "egui-winit" -version = "0.23.0" +version = "0.27.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c15479a96d9fadccf5dac690bdc6373b97b8e1c0dd28367058f25a5298da0195" +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 = "either" +version = "1.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a47c1c47d2f5964e29c61246e81db715514cd532db6b5116a25ea3c03d6780a2" + +[[package]] name = "emath" -version = "0.23.0" +version = "0.27.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ef2b29de53074e575c18b694167ccbe6e5191f7b25fe65175a0d905a32eeec0" +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 = "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 = "770d968249b5d99410d61f5bf89057f3199a077a04d087092f58e7d10692baae" +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-macros" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.60", +] + +[[package]] name = "foreign-types-shared" -version = "0.1.1" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" +checksum = "aa9a19cbb55df58761df49b23516a86d432839add4af60fc256da840f66ed35b" [[package]] name = "form_urlencoded" @@ -1218,25 +1446,52 @@ dependencies = [ ] [[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.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff4dd66668b557604244583e3e1e1eada8c5c2e96a6d0d6653ede395b78bbacb" +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 = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" + +[[package]] +name = "futures-executor" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c" +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", @@ -1355,22 +1611,10 @@ 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 = "gpu-alloc" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +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.3" +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 = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" +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 = "heck" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" + +[[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" @@ -1467,6 +1789,12 @@ 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" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1476,6 +1804,17 @@ dependencies = [ ] [[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" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -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]] @@ -1533,6 +1868,15 @@ dependencies = [ ] [[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" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1556,36 +1900,38 @@ 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_api" -version = "3.1.0" +name = "khronos-egl" +version = "6.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2db585e1d738fc771bf08a151420d3ed193d9d895a36df7f6f8a9456b911ddc" +checksum = "6aae1df220ece3c0ada96b8153459b67eebe9ae9212258bb0134ae60416fdf76" +dependencies = [ + "libc", + "libloading 0.8.3", + "pkg-config", +] [[package]] -name = "kv-log-macro" -version = "1.0.7" +name = "khronos_api" +version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0de8b303297635ad57c9f5059fd9cee7a47f8e8daa09df0fcd07dd39fb22977f" -dependencies = [ - "log", -] +checksum = "e2db585e1d738fc771bf08a151420d3ed193d9d895a36df7f6f8a9456b911ddc" [[package]] name = "lazy_static" @@ -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,56 +1963,55 @@ 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", + "windows-targets 0.52.5", ] [[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.1", + "bitflags 2.5.0", "libc", "redox_syscall 0.4.1", ] [[package]] name = "libredox" -version = "0.0.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3af92c55d7d839293953fcd0fda5ecfe93297cfde6ffbdec13b41d99c0ba6607" +checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" 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" +version = "0.8.0" +source = "git+https://gitlab.freedesktop.org/dimtpap/pipewire-rs.git?rev=605d15996f3258b3e1cc34e445dfbdf16a366c7e#605d15996f3258b3e1cc34e445dfbdf16a366c7e" dependencies = [ - "bitflags 2.4.1", + "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 = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" + +[[package]] +name = "litrs" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4cd1a83af159aa67994778be9070f0ae1bd732942279cabb14f86f986a21456" +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,44 +2063,50 @@ 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" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" +checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" dependencies = [ "autocfg", ] [[package]] name = "memoffset" -version = "0.7.1" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" +checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" dependencies = [ "autocfg", ] [[package]] -name = "memoffset" -version = "0.9.0" +name = "metal" +version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" +checksum = "c43f73953f8cbe511f021b58f18c3ce1c3d1ae13fe953293e13345bf83217f25" dependencies = [ - "autocfg", + "bitflags 2.5.0", + "block", + "core-graphics-types", + "foreign-types", + "log", + "objc", + "paste", ] [[package]] @@ -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,49 +2169,34 @@ 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" +version = "0.26.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f346ff70e7dbfd675fe90590b92d59ef2de15a8779ae305ebcbfd3f0caf59be4" +checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" dependencies = [ - "autocfg", "bitflags 1.3.2", "cfg-if", "libc", - "memoffset 0.6.5", + "memoffset 0.7.1", ] [[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]] @@ -1867,112 +2216,109 @@ dependencies = [ ] [[package]] -name = "num-integer" -version = "0.1.45" +name = "num-traits" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" +checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" dependencies = [ "autocfg", - "num-traits", ] [[package]] -name = "num-rational" -version = "0.4.1" +name = "num_enum" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" +checksum = "02339744ee7253741199f897151b38e72257d13802d4ee837285cc2990a90845" dependencies = [ - "autocfg", - "num-integer", - "num-traits", + "num_enum_derive", ] [[package]] -name = "num-traits" -version = "0.2.17" +name = "num_enum_derive" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" +checksum = "681030a937600a36906c185595136d26abfebb4aa9c65701cefcaf8578bb982b" dependencies = [ - "autocfg", + "proc-macro-crate 3.1.0", + "proc-macro2", + "quote", + "syn 2.0.60", ] [[package]] -name = "num_enum" -version = "0.5.11" +name = "objc" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9" +checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1" dependencies = [ - "num_enum_derive 0.5.11", + "malloc_buf", + "objc_exception", ] [[package]] -name = "num_enum" -version = "0.6.1" +name = "objc-sys" +version = "0.2.0-beta.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a015b430d3c108a207fd776d2e2196aaf8b1cf8cf93253e3a097ff3085076a1" -dependencies = [ - "num_enum_derive 0.6.1", -] +checksum = "df3b9834c1e95694a05a828b59f55fa2afec6288359cda67146126b3f90a55d7" [[package]] -name = "num_enum_derive" -version = "0.5.11" +name = "objc-sys" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799" -dependencies = [ - "proc-macro-crate", - "proc-macro2", - "quote", - "syn 1.0.109", -] +checksum = "da284c198fb9b7b0603f8635185e85fbd5b64ee154b1ed406d489077de2d6d60" [[package]] -name = "num_enum_derive" -version = "0.6.1" +name = "objc2" +version = "0.3.0-beta.3.patch-leaks.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96667db765a921f7b295ffee8b60472b686a51d4f21c2ee4ffdb94c7013b65a6" +checksum = "7e01640f9f2cb1220bbe80325e179e532cb3379ebcd1bf2279d703c19fe3a468" dependencies = [ - "proc-macro-crate", - "proc-macro2", - "quote", - "syn 2.0.41", + "block2 0.2.0-alpha.6", + "objc-sys 0.2.0-beta.2", + "objc2-encode 2.0.0-pre.2", ] [[package]] -name = "objc" -version = "0.2.7" +name = "objc2" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1" +checksum = "559c5a40fdd30eb5e344fbceacf7595a81e242529fb4e21cf5f43fb4f11ff98d" dependencies = [ - "malloc_buf", + "objc-sys 0.3.3", + "objc2-encode 3.0.0", ] [[package]] -name = "objc-foundation" -version = "0.1.1" +name = "objc2" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1add1b659e36c9607c7aab864a76c7a4c2760cd0cd2e120f3fb8b952c7e22bf9" +checksum = "b4b25e1034d0e636cd84707ccdaa9f81243d399196b8a773946dcffec0401659" dependencies = [ - "block", - "objc", - "objc_id", + "objc-sys 0.3.3", + "objc2-encode 4.0.1", ] [[package]] -name = "objc-sys" -version = "0.2.0-beta.2" +name = "objc2-app-kit" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df3b9834c1e95694a05a828b59f55fa2afec6288359cda67146126b3f90a55d7" +checksum = "fb79768a710a9a1798848179edb186d1af7e8a8679f369e4b8d201dd2a034047" +dependencies = [ + "block2 0.5.0", + "objc2 0.5.1", + "objc2-core-data", + "objc2-foundation", +] [[package]] -name = "objc2" -version = "0.3.0-beta.3.patch-leaks.3" +name = "objc2-core-data" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e01640f9f2cb1220bbe80325e179e532cb3379ebcd1bf2279d703c19fe3a468" +checksum = "6e092bc42eaf30a08844e6a076938c60751225ec81431ab89f5d1ccd9f958d6c" dependencies = [ - "block2", - "objc-sys", - "objc2-encode", + "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 = "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 = "c92d4ddb4bd7b50d730c215ff871754d0da6b2178849f8a2a2ab69712d0c073b" +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]] @@ -2063,12 +2431,6 @@ 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" @@ -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", ] @@ -2185,6 +2548,12 @@ 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" @@ -2195,6 +2564,15 @@ dependencies = [ ] [[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" @@ -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 = "profiling" +version = "1.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +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.33" +version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" dependencies = [ "proc-macro2", ] @@ -2273,6 +2666,32 @@ 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" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2291,21 +2710,30 @@ dependencies = [ ] [[package]] +name = "redox_syscall" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "469052894dcb553421e483e4209ee581a45100d31b4018de03e5a7ad86374a7e" +dependencies = [ + "bitflags 2.5.0", +] + +[[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 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 = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" + +[[package]] +name = "renderdoc-sys" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" +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]] @@ -2545,16 +2995,19 @@ dependencies = [ ] [[package]] -name = "static_assertions" -version = "1.1.0" +name = "spirv" +version = "0.3.0+sdk-1.3.268.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" +checksum = "eda41003dc44290527a59b13432d4a0379379fa074b70174882adfbdfd917844" +dependencies = [ + "bitflags 2.5.0", +] [[package]] -name = "str-buf" -version = "1.0.6" +name = "static_assertions" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e08d8363704e6c71fc928674353e6b7c23dcea9d82d7012c8faf2a3a025f8d0" +checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" [[package]] name = "strict-num" @@ -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]] @@ -2759,6 +3231,15 @@ 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" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -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" @@ -2815,22 +3308,10 @@ dependencies = [ ] [[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", + "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.5.0", + "rustix 0.38.34", + "wayland-backend", "wayland-scanner", - "wayland-sys 0.29.5", ] [[package]] -name = "wayland-commons" -version = "0.29.5" +name = "wayland-csd-frame" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8691f134d584a33a6606d9d717b95c4fa20065605f798a3f350d78dced02a902" +checksum = "625c5029dbd43d25e6aa9615e88b829a5cad13b2819c4ae129fdbb7c31ab4c7e" dependencies = [ - "nix 0.24.3", - "once_cell", - "smallvec", - "wayland-sys 0.29.5", + "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-scanner" -version = "0.29.5" +name = "wayland-protocols-plasma" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f4303d8fa22ab852f789e75a967f0a2cdc430a607751c0499bada3e451cbd53" +checksum = "23803551115ff9ea9bce586860c5c5a971e360825a0309264102a9495a5ff479" dependencies = [ - "proc-macro2", - "quote", - "xml-rs", + "bitflags 2.5.0", + "wayland-backend", + "wayland-client", + "wayland-protocols", + "wayland-scanner", ] [[package]] -name = "wayland-sys" -version = "0.29.5" +name = "wayland-protocols-wlr" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be12ce1a3c39ec7dba25594b97b42cb3195d54953ddb9d3d95a7c3902bc6e9d4" +checksum = "ad1f61b76b6c2d8742e10f9ba5c3737f6530b4c243132c2a2ccc8aa96fe25cd6" dependencies = [ - "dlib", - "lazy_static", - "pkg-config", + "bitflags 2.5.0", + "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.30.1" +version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96b2a02ac608e07132978689a6f9bf4214949c85998c247abadd4f4129b1aa06" +checksum = "15a0c8eaff5216d07f226cb7a549159267f3467b289d9a2e52fd3ef5aae2b7af" 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,12 +3548,120 @@ 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" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3066,20 +3679,11 @@ 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" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44c17110f57155602a80dca10be03852116403c9ff3cd25b079d666f2aa3df6e" +checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b" dependencies = [ - "winapi", + "windows-sys 0.52.0", ] [[package]] @@ -3100,6 +3704,25 @@ dependencies = [ ] [[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" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -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 = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" +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.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" +dependencies = [ + "memchr", ] [[package]] name = "winnow" -version = "0.5.28" +version = "0.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c830786f7720c2fd27a1a0e27a709dbd3c4d009b56d098fc742d4f4eab91fe2" +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 = "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.19" +version = "0.8.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fcb9cbac069e033553e8bb871be2fbdffcab578eb25bd0f7c508cedc6dcd75a" +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/pkgs/by-name/co/coppwr/package.nix b/pkgs/by-name/co/coppwr/package.nix index dc1e923233553..25a0952fc7dac 100644 --- a/pkgs/by-name/co/coppwr/package.nix +++ b/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/pkgs/development/libraries/discord-gamesdk/default.nix b/pkgs/by-name/di/discord-gamesdk/package.nix index 86e1a70accdea..b2f9a08dc7724 100644 --- a/pkgs/development/libraries/discord-gamesdk/default.nix +++ b/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/pkgs/by-name/fi/files-cli/package.nix b/pkgs/by-name/fi/files-cli/package.nix index adb9b6694024e..886bf6297c858 100644 --- a/pkgs/by-name/fi/files-cli/package.nix +++ b/pkgs/by-name/fi/files-cli/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "files-cli"; - version = "2.13.27"; + version = "2.13.41"; src = fetchFromGitHub { repo = "files-cli"; owner = "files-com"; rev = "v${version}"; - hash = "sha256-UbABURsoQkTwYvQqR7Eg8ti56JQKnIcAm78Tmu+W+ls="; + hash = "sha256-WW6E0K3HOi8gtBwcmN9syV4wM73BPGyXbv3t4ZJjoIc="; }; - vendorHash = "sha256-8xiIMl4eAFMvMsN5Y+ruw04BtdA+mrCnqxsoekyr4Bo="; + vendorHash = "sha256-LdebAbdbiUX0xw1EJKCzK1jdt5+FgoZQBPI0apZkcsc="; ldflags = [ "-s" diff --git a/pkgs/by-name/fl/flarectl/package.nix b/pkgs/by-name/fl/flarectl/package.nix index c8cba47510c7e..c094fe961af9f 100644 --- a/pkgs/by-name/fl/flarectl/package.nix +++ b/pkgs/by-name/fl/flarectl/package.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "flarectl"; - version = "0.94.0"; + version = "0.95.0"; src = fetchFromGitHub { owner = "cloudflare"; repo = "cloudflare-go"; rev = "v${version}"; - hash = "sha256-8lZJn4/IpkNT9IHK3rGvNE/Rv0CHQlVVu4F3K+J8fRA="; + hash = "sha256-GcmFRtQ8aqicvawCpFDo+oheUSOgKewBETIizPKcyGU="; }; - vendorHash = "sha256-/81Onrs+qyKEt79DtfX4EDDVxhzB0uqaHa3X+GbupWQ="; + vendorHash = "sha256-Jtap4hGwNr8lpXi6huGikL4iUSP242cIiFyvGveszq8="; subPackages = [ "cmd/flarectl" ]; diff --git a/pkgs/tools/misc/fontfor/default.nix b/pkgs/by-name/fo/fontfor/package.nix index b973317b722e3..d2a5747809372 100644 --- a/pkgs/tools/misc/fontfor/default.nix +++ b/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/pkgs/by-name/fo/forbidden/package.nix b/pkgs/by-name/fo/forbidden/package.nix index adbd83ada4b08..a3f57a4a05ddc 100644 --- a/pkgs/by-name/fo/forbidden/package.nix +++ b/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/pkgs/by-name/fr/free42/package.nix b/pkgs/by-name/fr/free42/package.nix index 415f6f6f8b9d4..679e43fc1d2c6 100644 --- a/pkgs/by-name/fr/free42/package.nix +++ b/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/pkgs/by-name/gl/glsl_analyzer/package.nix b/pkgs/by-name/gl/glsl_analyzer/package.nix new file mode 100644 index 0000000000000..ed57790a27d66 --- /dev/null +++ b/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/pkgs/by-name/go/go-landlock/package.nix b/pkgs/by-name/go/go-landlock/package.nix new file mode 100644 index 0000000000000..44b7ba5573cee --- /dev/null +++ b/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/pkgs/by-name/go/go-passbolt-cli/package.nix b/pkgs/by-name/go/go-passbolt-cli/package.nix new file mode 100644 index 0000000000000..e774769ae45e0 --- /dev/null +++ b/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/pkgs/applications/networking/browsers/google-chrome/default.nix b/pkgs/by-name/go/google-chrome/package.nix index 8abb0f8f3ae82..d31d5bafe09b6 100644 --- a/pkgs/applications/networking/browsers/google-chrome/default.nix +++ b/pkgs/by-name/go/google-chrome/package.nix @@ -64,11 +64,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "google-chrome"; - version = "124.0.6367.118"; + version = "124.0.6367.201"; 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-H3bv6WiVBl4j38ROZ80+SD9UO9ok+xxcKFxDd9yjWNY="; + hash = "sha256-RvQdpDmWRcsASh1b8M0Zg+AvZprE5qhi14shfo0WlfE="; }; nativeBuildInputs = [ patchelf makeWrapper ]; @@ -142,12 +142,12 @@ in stdenv.mkDerivation (finalAttrs: { runHook postInstall ''; - meta = with lib; { + 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; [ jnsgruk ]; + license = lib.licenses.unfree; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + maintainers = with lib.maintainers; [ jnsgruk johnrtitor ]; platforms = [ "x86_64-linux" ]; mainProgram = "google-chrome-stable"; }; diff --git a/pkgs/by-name/gr/greenmask/package.nix b/pkgs/by-name/gr/greenmask/package.nix index 432c914468ec8..4e5504ce769c1 100644 --- a/pkgs/by-name/gr/greenmask/package.nix +++ b/pkgs/by-name/gr/greenmask/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "greenmask"; - version = "0.1.13"; + version = "0.1.14"; src = fetchFromGitHub { owner = "GreenmaskIO"; repo = "greenmask"; rev = "refs/tags/v${version}"; - hash = "sha256-d3VMq0sW5WEmSWssOknWQ+tmG8N1w4KYKl1QT4R9SRY="; + hash = "sha256-R/JJnHBp9MPnq/fIDwYrePIUH3/FvDPFaRpmrpwhU6o="; }; vendorHash = "sha256-WCsZ5DU+mZk9M1lldBY4q2PXI8DDFytPojzGJ6wqXsg="; diff --git a/pkgs/by-name/gr/grype/package.nix b/pkgs/by-name/gr/grype/package.nix index 6aff8bd6a0010..25cf7d472839b 100644 --- a/pkgs/by-name/gr/grype/package.nix +++ b/pkgs/by-name/gr/grype/package.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "grype"; - version = "0.77.3"; + version = "0.77.4"; src = fetchFromGitHub { owner = "anchore"; repo = "grype"; rev = "refs/tags/v${version}"; - hash = "sha256-P6p8vuiJ8+KX1V4crHi5J8SwigW6cpF2C30BnUBAgpM="; + 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-GS1TfLCQTWAdjHMfVM6vu8mnR2vclH9VpVMdNwNNU6M="; + vendorHash = "sha256-WosgdN49MEXSfK42l4em+Cpk8iAQphf9KOhY0mgBQ7U="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/ha/halloy/Cargo.lock b/pkgs/by-name/ha/halloy/Cargo.lock index 774723b056a05..74e5fa582d6ce 100644 --- a/pkgs/by-name/ha/halloy/Cargo.lock +++ b/pkgs/by-name/ha/halloy/Cargo.lock @@ -121,6 +121,12 @@ dependencies = [ ] [[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" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -246,6 +252,18 @@ dependencies = [ ] [[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" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -414,6 +432,12 @@ dependencies = [ [[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" @@ -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]] @@ -1271,6 +1296,20 @@ dependencies = [ ] [[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" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -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", ] @@ -5302,6 +5343,12 @@ 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" diff --git a/pkgs/by-name/ha/halloy/package.nix b/pkgs/by-name/ha/halloy/package.nix index b38708b97423f..7075d2a4a9a52 100644 --- a/pkgs/by-name/ha/halloy/package.nix +++ b/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/pkgs/by-name/ha/halo/package.nix b/pkgs/by-name/ha/halo/package.nix new file mode 100644 index 0000000000000..998e1f3706989 --- /dev/null +++ b/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/pkgs/by-name/hy/hyprland-workspaces/package.nix b/pkgs/by-name/hy/hyprland-workspaces/package.nix index 4ca89b0da1188..11307059e6806 100644 --- a/pkgs/by-name/hy/hyprland-workspaces/package.nix +++ b/pkgs/by-name/hy/hyprland-workspaces/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "hyprland-workspaces"; - version = "2.0.0"; + version = "2.0.1"; src = fetchFromGitHub { owner = "FieldofClay"; repo = "hyprland-workspaces"; rev = "v${version}"; - hash = "sha256-4QGLTimIpx74gWUyHCheUZZT1WgVzBoJRY8OlUDdOh4="; + hash = "sha256-GhUjvFMlgjTdgtV9ASW7IqE2dBktPyOlRwg6qM1r7vc="; }; - cargoHash = "sha256-9ndP0nyRBCdOGth4UWA263IvjbgnVW2x9PK8oTaMrxg="; + cargoHash = "sha256-RZVQSkegX8Fa9SNY7tGNxyu312oeDjXK4U1+1/UIAyA="; meta = with lib; { description = "A multi-monitor aware Hyprland workspace widget"; diff --git a/pkgs/by-name/in/incus/generic.nix b/pkgs/by-name/in/incus/generic.nix index cf73d366e10c8..0e05a51ceee2a 100644 --- a/pkgs/by-name/in/incus/generic.nix +++ b/pkgs/by-name/in/incus/generic.nix @@ -115,7 +115,7 @@ buildGoModule rec { ; }; - tests = nixosTests.incus; + tests = if lts then nixosTests.incus-lts else nixosTests.incus; ui = callPackage ./ui.nix { }; diff --git a/pkgs/by-name/in/incus/package.nix b/pkgs/by-name/in/incus/package.nix index 50fccf3e77ee4..be289a05e0772 100644 --- a/pkgs/by-name/in/incus/package.nix +++ b/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/pkgs/by-name/kc/kcl-cli/package.nix b/pkgs/by-name/kc/kcl-cli/package.nix index ea0b5536b5289..a6aa42ead1b99 100644 --- a/pkgs/by-name/kc/kcl-cli/package.nix +++ b/pkgs/by-name/kc/kcl-cli/package.nix @@ -5,14 +5,14 @@ buildGoModule rec { pname = "kcl-cli"; - version = "0.8.7"; + version = "0.8.8"; src = fetchFromGitHub { owner = "kcl-lang"; repo = "cli"; rev = "v${version}"; - hash = "sha256-OKRMgxynKmHnO+5tcKlispFkpQehHINzB6qphH+lwHQ="; + hash = "sha256-Bk/sCNMDupdY/YyKT+VoPIzEfjFDa5z9pevcCPnTX8U="; }; - vendorHash = "sha256-dF0n1/SmQVd2BUVOPmvZWWUJYTn2mMnbgZC92luSY2s="; + vendorHash = "sha256-Xv8Tfq9Kb1xGFCWZQwBFDX9xZW9j99td/DUb7jBtkpE="; ldflags = [ "-X=kcl-lang.io/cli/pkg/version.version=${version}" ]; diff --git a/pkgs/by-name/ko/komac/package.nix b/pkgs/by-name/ko/komac/package.nix index 3a87faa3c4ab2..b15fc902b2563 100644 --- a/pkgs/by-name/ko/komac/package.nix +++ b/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/pkgs/by-name/la/labwc/package.nix b/pkgs/by-name/la/labwc/package.nix index 36aa398e8767e..a6906f440ea1d 100644 --- a/pkgs/by-name/la/labwc/package.nix +++ b/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/pkgs/by-name/li/libation/package.nix b/pkgs/by-name/li/libation/package.nix index 75cc9c128187f..692de5d3d909a 100644 --- a/pkgs/by-name/li/libation/package.nix +++ b/pkgs/by-name/li/libation/package.nix @@ -1,20 +1,21 @@ -{ lib -, stdenv -, buildDotnetModule -, fetchFromGitHub -, dotnetCorePackages -, wrapGAppsHook3 +{ + 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 { @@ -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/pkgs/by-name/li/libsbml/package.nix b/pkgs/by-name/li/libsbml/package.nix new file mode 100644 index 0000000000000..ce895beee0060 --- /dev/null +++ b/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/pkgs/by-name/li/litmusctl/package.nix b/pkgs/by-name/li/litmusctl/package.nix new file mode 100644 index 0000000000000..83ba16b98da25 --- /dev/null +++ b/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/pkgs/by-name/lo/local-ai/package.nix b/pkgs/by-name/lo/local-ai/package.nix index c40cb70cee02f..5d582f3604a65 100644 --- a/pkgs/by-name/lo/local-ai/package.nix +++ b/pkgs/by-name/lo/local-ai/package.nix @@ -3,7 +3,6 @@ , stdenv , lib , addDriverRunpath -, fetchpatch , fetchFromGitHub , protobuf , protoc-gen-go @@ -100,8 +99,8 @@ let src = fetchFromGitHub { owner = "ggerganov"; repo = "llama.cpp"; - rev = "6ecf3189e00a1e8e737a78b6d10e1d7006e050a2"; - hash = "sha256-JS287UdCzj6Es134cbhr8y/AoejMEux0w++/pZ5NejY="; + rev = "c12452c7aec8a02264afc00196a13caa591a13ac"; + hash = "sha256-Kji8dlz7OfhPeNXnYgBHzpGGMhCsRLJ9d+EFf77Q6Co="; fetchSubmodules = true; }; postPatch = prev.postPatch + '' @@ -254,8 +253,8 @@ let src = fetchFromGitHub { owner = "ggerganov"; repo = "whisper.cpp"; - rev = "8fac6455ffeb0a0950a84e790ddb74f7290d33c4"; - hash = "sha256-Dez/Q2vMvSmscS+BJwkgZ4QG+ebM/N8s1Okd5my0CWI="; + rev = "73d13ad19a8c9c4da4f405088a85169b1a171e66"; + hash = "sha256-7g/J3a3behGgcJXy9ryAYXxgOYnsRMlGmux13re28AY="; }; nativeBuildInputs = [ cmake pkg-config ] @@ -373,18 +372,18 @@ let stdenv; pname = "local-ai"; - version = "2.14.0"; + version = "2.15.0"; src = fetchFromGitHub { owner = "go-skynet"; repo = "LocalAI"; rev = "v${version}"; - hash = "sha256-wr7sTMjGofGiZZbRJ+RfgXx9TM9Adu2NBAXeB3P5Ep0="; + hash = "sha256-AjNgfZjVxlw0LtPbUTbJuLcUfqJdPzn6vOmUDz/v7Jc="; }; self = buildGoModule.override { stdenv = effectiveStdenv; } { inherit pname version src; - vendorHash = "sha256-nWNK2YekQnBSLx4ouNSe6esIe0yFuo69E0HStYLQANg="; + vendorHash = "sha256-+ZPZkOpaTsKrL2HDOEtAr8sT6uqTiQXo/XS+MBNZq5E="; env.NIX_CFLAGS_COMPILE = lib.optionalString with_stablediffusion " -isystem ${opencv}/include/opencv4"; @@ -404,11 +403,13 @@ let -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 ] diff --git a/pkgs/by-name/lo/local-ai/tests.nix b/pkgs/by-name/lo/local-ai/tests.nix index 10895bce65712..5740362f24efd 100644 --- a/pkgs/by-name/lo/local-ai/tests.nix +++ b/pkgs/by-name/lo/local-ai/tests.nix @@ -28,7 +28,7 @@ in command = "local-ai --help"; }; - health = testers.runNixOSTest ({ config, ... }: { + health = testers.runNixOSTest { name = self.name + "-health"; nodes.machine = common-config; testScript = @@ -40,10 +40,9 @@ in machine.succeed("curl -f http://localhost:${port}/readyz") 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 = @@ -84,11 +83,12 @@ in 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 == \"${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") ''; }; @@ -183,19 +183,21 @@ in 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") ''; }; @@ -257,12 +259,15 @@ in 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/pkgs/by-name/me/mediainfo-gui/package.nix b/pkgs/by-name/me/mediainfo-gui/package.nix index a321db523179e..7016a9a6cc4c9 100644 --- a/pkgs/by-name/me/mediainfo-gui/package.nix +++ b/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/pkgs/servers/misc/navidrome/default.nix b/pkgs/by-name/na/navidrome/package.nix index d7722688c7743..fda3170bd0021 100644 --- a/pkgs/servers/misc/navidrome/default.nix +++ b/pkgs/by-name/na/navidrome/package.nix @@ -10,7 +10,6 @@ , ffmpeg-headless , taglib , zlib -, makeWrapper , nixosTests , nix-update-script , ffmpegSupport ? true diff --git a/pkgs/by-name/ne/nekoray/package.nix b/pkgs/by-name/ne/nekoray/package.nix index 4a1ce8f046620..1fda18056a6eb 100644 --- a/pkgs/by-name/ne/nekoray/package.nix +++ b/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/pkgs/by-name/nh/nh/package.nix b/pkgs/by-name/nh/nh/package.nix index 23838fb804b53..e20797546f1a0 100644 --- a/pkgs/by-name/nh/nh/package.nix +++ b/pkgs/by-name/nh/nh/package.nix @@ -10,7 +10,7 @@ , nix-output-monitor }: let - version = "3.5.14"; + 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-4vXLHDj6TnEXjJIzEcToHQ+6Rp4EnMpOFHQ3Ypymh0s="; + hash = "sha256-1mE4ZXGAMZl2Mufr47y+2UMDHBelqsvChaCsQDK3m70="; }; strictDeps = true; @@ -47,7 +47,7 @@ rustPlatform.buildRustPackage { --prefix PATH : ${lib.makeBinPath runtimeDeps} ''; - cargoHash = "sha256-A2AFlm6Qs7IuR6LedapWx4RL0Ae5E7eSBJSMXjrONHE="; + cargoHash = "sha256-5BazSJGsafSl0eE7GOWw2SrVgC3k1tlrLiIFIpC51/o="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ni/nim_lk/package.nix b/pkgs/by-name/ni/nim_lk/package.nix index 680ba976b5bdd..184d1e27745ad 100644 --- a/pkgs/by-name/ni/nim_lk/package.nix +++ b/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/pkgs/by-name/nr/nrr/package.nix b/pkgs/by-name/nr/nrr/package.nix index 0992152aed3e9..7d43400dba3e9 100644 --- a/pkgs/by-name/nr/nrr/package.nix +++ b/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/pkgs/by-name/nu/nuclei-templates/package.nix b/pkgs/by-name/nu/nuclei-templates/package.nix index 09142e93ca102..90eb9d35d25ec 100644 --- a/pkgs/by-name/nu/nuclei-templates/package.nix +++ b/pkgs/by-name/nu/nuclei-templates/package.nix @@ -6,13 +6,13 @@ stdenvNoCC.mkDerivation rec { pname = "nuclei-templates"; - version = "9.8.5"; + version = "9.8.6"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "nuclei-templates"; rev = "refs/tags/v${version}"; - hash = "sha256-j1W/Gq002Y+/Lrq51Od8iZoxbMJji20kpbUaCC7ieqE="; + hash = "sha256-3hJfWSBciJ/UutVBIGisptcxmtWfvSfTbx55cyWxs4k="; }; installPhase = '' diff --git a/pkgs/by-name/on/onedriver/package.nix b/pkgs/by-name/on/onedriver/package.nix index ae2ad038d58e2..c4e3ba572d28a 100644 --- a/pkgs/by-name/on/onedriver/package.nix +++ b/pkgs/by-name/on/onedriver/package.nix @@ -7,6 +7,7 @@ , fuse , installShellFiles , wrapGAppsHook3 +, glib-networking , wrapperDir ? "/run/wrappers/bin" }: let @@ -25,7 +26,7 @@ buildGoModule { vendorHash = "sha256-OOiiKtKb+BiFkoSBUQQfqm4dMfDW3Is+30Kwcdg8LNA="; nativeBuildInputs = [ pkg-config installShellFiles wrapGAppsHook3 ]; - buildInputs = [ webkitgtk_4_1 glib fuse ]; + buildInputs = [ webkitgtk_4_1 glib fuse glib-networking ]; ldflags = [ "-X github.com/jstaf/onedriver/cmd/common.commit=v${version}" ]; diff --git a/pkgs/by-name/op/openfga-cli/package.nix b/pkgs/by-name/op/openfga-cli/package.nix new file mode 100644 index 0000000000000..1cdbfaca786dd --- /dev/null +++ b/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/pkgs/by-name/op/openfga/package.nix b/pkgs/by-name/op/openfga/package.nix new file mode 100644 index 0000000000000..3b034bb11643d --- /dev/null +++ b/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/pkgs/by-name/ot/oterm/package.nix b/pkgs/by-name/ot/oterm/package.nix index 75220b2f69dcb..c321aca862362 100644 --- a/pkgs/by-name/ot/oterm/package.nix +++ b/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.7"; + version = "0.2.8"; pyproject = true; src = fetchFromGitHub { owner = "ggozad"; repo = "oterm"; rev = "refs/tags/${version}"; - hash = "sha256-vKVGSIneKQkFO1uoNaW/Yr6QTDhgokmIpkYFYIbm+U4="; + 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 - ]; - - nativeBuildInputs = with python3Packages; [ - poetry-core - pythonRelaxDepsHook + pyperclip + python-dotenv + rich-pixels + textual + typer ]; - 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/pkgs/by-name/pr/pragtical/package.nix b/pkgs/by-name/pr/pragtical/package.nix new file mode 100644 index 0000000000000..cfa6269b89f44 --- /dev/null +++ b/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/pkgs/by-name/pr/pretalx/package.nix b/pkgs/by-name/pr/pretalx/package.nix index 266beb9364ba6..78b2f8d4df0b1 100644 --- a/pkgs/by-name/pr/pretalx/package.nix +++ b/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; }; diff --git a/pkgs/by-name/pr/private-gpt/package.nix b/pkgs/by-name/pr/private-gpt/package.nix new file mode 100644 index 0000000000000..1b717cc2bfb83 --- /dev/null +++ b/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/pkgs/by-name/pr/protonmail-desktop/package.nix b/pkgs/by-name/pr/protonmail-desktop/package.nix index b3edfaa9dc212..fce6e7bef53eb 100644 --- a/pkgs/by-name/pr/protonmail-desktop/package.nix +++ b/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/pkgs/by-name/sb/sbom-utility/package.nix b/pkgs/by-name/sb/sbom-utility/package.nix index 213dc94cff579..0b3b9ffba21fa 100644 --- a/pkgs/by-name/sb/sbom-utility/package.nix +++ b/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/pkgs/by-name/sc/screenly-cli/package.nix b/pkgs/by-name/sc/screenly-cli/package.nix index b2f0cf70ccf7b..360e1d2abb920 100644 --- a/pkgs/by-name/sc/screenly-cli/package.nix +++ b/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/pkgs/by-name/sh/shopware-cli/package.nix b/pkgs/by-name/sh/shopware-cli/package.nix index 587716eab9d34..899b956b50a68 100644 --- a/pkgs/by-name/sh/shopware-cli/package.nix +++ b/pkgs/by-name/sh/shopware-cli/package.nix @@ -9,12 +9,12 @@ buildGoModule rec { pname = "shopware-cli"; - version = "0.4.42"; + version = "0.4.43"; src = fetchFromGitHub { repo = "shopware-cli"; owner = "FriendsOfShopware"; rev = version; - hash = "sha256-+nSX7HUf9o43d3BoPPXebvMSdS1D2J6VVo7FWCwQcSU="; + hash = "sha256-c8CaPxV54bF4Unlz15SIh64jiGZMZywcKOzdZ74AtaM="; }; nativeBuildInputs = [ installShellFiles makeWrapper ]; diff --git a/pkgs/applications/video/showmethekey/default.nix b/pkgs/by-name/sh/showmethekey/package.nix index ef30ed13784c0..7faf5dec439e8 100644 --- a/pkgs/applications/video/showmethekey/default.nix +++ b/pkgs/by-name/sh/showmethekey/package.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "showmethekey"; - version = "1.13.0"; + version = "1.13.1"; src = fetchFromGitHub { owner = "AlynxZhou"; repo = "showmethekey"; rev = "refs/tags/v${version}"; - hash = "sha256-pVFkO/+a7GAOXbYBfU0zcO/uD26PX+y02bEZa3f1ZP8="; + hash = "sha256-kifUp/neqTBPRuZKqNdW6JOinzh9LKfppyvW9AgxAYo="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/su/superfile/package.nix b/pkgs/by-name/su/superfile/package.nix new file mode 100644 index 0000000000000..21abce75d3d0f --- /dev/null +++ b/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/pkgs/by-name/sy/systemctl-tui/package.nix b/pkgs/by-name/sy/systemctl-tui/package.nix index fa67d89062116..f51ada76c07eb 100644 --- a/pkgs/by-name/sy/systemctl-tui/package.nix +++ b/pkgs/by-name/sy/systemctl-tui/package.nix @@ -7,14 +7,14 @@ rustPlatform.buildRustPackage rec { pname = "systemctl-tui"; - version = "0.3.4"; + version = "0.3.5"; src = fetchCrate { inherit pname version; - hash = "sha256-yEBh8A0mWXVBkbemPEhvSNgsP+YF/WiLYKMkOPCa6e4="; + hash = "sha256-CONg4amz4WaaZC/RtptzZDxLY8QnYqSnmpbBTILHjos="; }; - cargoHash = "sha256-IaDAQ9EHkcwwI2z0c8YNIgbjs2zwMblHbCKF0E92+V8="; + cargoHash = "sha256-EQ5vAAO52KXt9RhnB+P0cX7mCvXDYSxPfSh+Ak/DN0g="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.AppKit diff --git a/pkgs/by-name/ta/tailscale-nginx-auth/package.nix b/pkgs/by-name/ta/tailscale-nginx-auth/package.nix index 044334c602648..51b992bf7da76 100644 --- a/pkgs/by-name/ta/tailscale-nginx-auth/package.nix +++ b/pkgs/by-name/ta/tailscale-nginx-auth/package.nix @@ -1,7 +1,7 @@ { lib, stdenv, buildGoModule, fetchFromGitHub }: let - version = "1.64.2"; + version = "1.66.0"; in buildGoModule { pname = "tailscale-nginx-auth"; @@ -11,9 +11,9 @@ buildGoModule { owner = "tailscale"; repo = "tailscale"; rev = "v${version}"; - hash = "sha256-DS7C/G1Nj9gIjYwXaEeCLbtH9HbB0tRoJBDjZc/nq5g="; + hash = "sha256-ZI9/YlVHbdvEwD0YHWfUhciU2x4wp4GzTanwDvuIpz4="; }; - vendorHash = "sha256-pYeHqYd2cCOVQlD1r2lh//KC+732H0lj1fPDBr+W8qA="; + vendorHash = "sha256-Hd77xy8stw0Y6sfk3/ItqRIbM/349M/4uf0iNy1xJGw="; CGO_ENABLED = 0; diff --git a/pkgs/by-name/ta/taskwarrior3/package.nix b/pkgs/by-name/ta/taskwarrior3/package.nix index 6f48f5593231e..dd5f038b1503f 100644 --- a/pkgs/by-name/ta/taskwarrior3/package.nix +++ b/pkgs/by-name/ta/taskwarrior3/package.nix @@ -15,15 +15,15 @@ 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 \ @@ -55,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/pkgs/by-name/ti/tinymist/Cargo.lock b/pkgs/by-name/ti/tinymist/Cargo.lock index b561b67c1088d..d841971169afe 100644 --- a/pkgs/by-name/ti/tinymist/Cargo.lock +++ b/pkgs/by-name/ti/tinymist/Cargo.lock @@ -29,6 +29,18 @@ dependencies = [ ] [[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" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -38,6 +50,12 @@ dependencies = [ ] [[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" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -122,6 +140,12 @@ dependencies = [ ] [[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" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1468,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]] @@ -1476,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" @@ -3681,7 +3718,7 @@ dependencies = [ [[package]] name = "tests" -version = "0.11.6" +version = "0.11.8" dependencies = [ "insta", "lsp-server", @@ -3778,7 +3815,7 @@ dependencies = [ [[package]] name = "tinymist" -version = "0.11.6" +version = "0.11.8" dependencies = [ "anyhow", "async-trait", @@ -3829,9 +3866,10 @@ dependencies = [ [[package]] name = "tinymist-query" -version = "0.11.6" +version = "0.11.8" dependencies = [ "anyhow", + "biblatex", "comemo 0.4.0", "ecow 0.2.2", "ena", @@ -3854,7 +3892,9 @@ dependencies = [ "rust_iso639", "serde", "serde_json", + "serde_yaml", "sha2", + "siphasher 1.0.1", "strum 0.26.2", "toml 0.8.12", "ttf-parser", @@ -3863,11 +3903,12 @@ dependencies = [ "typst-ts-core", "unscanny", "walkdir", + "yaml-rust2", ] [[package]] name = "tinymist-render" -version = "0.11.6" +version = "0.11.8" dependencies = [ "base64 0.22.0", "log", @@ -4131,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", @@ -4198,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", @@ -4209,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", @@ -4269,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", @@ -4289,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", @@ -4322,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", @@ -4338,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", @@ -4458,9 +4499,9 @@ dependencies = [ [[package]] name = "typstyle" -version = "0.11.14" +version = "0.11.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f701eb3c275c8250b3e5e18c3c081e36861cdd5b2e78538ff4984735cbfd9591" +checksum = "b25283094eca3cf1200a2105bb339f367e1fb127e69b22ae106d7e706d7eb08d" dependencies = [ "anyhow", "clap", @@ -5133,6 +5174,17 @@ dependencies = [ ] [[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" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5157,6 +5209,26 @@ dependencies = [ ] [[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" source = "registry+https://github.com/rust-lang/crates.io-index" diff --git a/pkgs/by-name/ti/tinymist/package.nix b/pkgs/by-name/ti/tinymist/package.nix index da21891455818..9849b56f1eef0 100644 --- a/pkgs/by-name/ti/tinymist/package.nix +++ b/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.6"; + version = "0.11.8"; src = fetchFromGitHub { owner = "Myriad-Dreamin"; repo = "tinymist"; rev = "v${version}"; - hash = "sha256-7YG15kt+pIxAK22QYiTApu5lBV6Afe3Jss6L5dTGsGI="; + 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/pkgs/applications/networking/p2p/tribler/default.nix b/pkgs/by-name/tr/tribler/package.nix index bb009ff0adf0e..db89a613d3166 100644 --- a/pkgs/applications/networking/p2p/tribler/default.nix +++ b/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/pkgs/by-name/tr/troubadix/package.nix b/pkgs/by-name/tr/troubadix/package.nix index 9575a83ce48f4..d70553604bc38 100644 --- a/pkgs/by-name/tr/troubadix/package.nix +++ b/pkgs/by-name/tr/troubadix/package.nix @@ -7,14 +7,14 @@ python3.pkgs.buildPythonApplication rec { pname = "troubadix"; - version = "24.4.1"; + version = "24.5.1"; pyproject = true; src = fetchFromGitHub { owner = "greenbone"; repo = "troubadix"; rev = "refs/tags/v${version}"; - hash = "sha256-+JrMUog04SS24ZKiBFB46AyYTDzVu7d4IdoX9SRMhpk="; + hash = "sha256-kA+9zcP3unNb2tE3OU8J/3xHX+pRZ/06lEQtH/0QEk4="; }; pythonRelaxDeps = [ "validators" ]; diff --git a/pkgs/by-name/tu/tuifimanager/package.nix b/pkgs/by-name/tu/tuifimanager/package.nix index 569dff59703d1..7d54de40be3b0 100644 --- a/pkgs/by-name/tu/tuifimanager/package.nix +++ b/pkgs/by-name/tu/tuifimanager/package.nix @@ -1,8 +1,22 @@ -{ 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 = "4.0.6"; @@ -18,12 +32,34 @@ python3.pkgs.buildPythonApplication rec { 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 + ''; + pythonImportsCheck = [ "TUIFIManager" ]; meta = with lib; { diff --git a/pkgs/by-name/ue/ueberzugpp/package.nix b/pkgs/by-name/ue/ueberzugpp/package.nix index 82fe4ef72ca82..cc0e0cd795358 100644 --- a/pkgs/by-name/ue/ueberzugpp/package.nix +++ b/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/pkgs/by-name/ve/vencord/package-lock.json b/pkgs/by-name/ve/vencord/package-lock.json index 295538b088ef9..a5c9f7b543972 100644 --- a/pkgs/by-name/ve/vencord/package-lock.json +++ b/pkgs/by-name/ve/vencord/package-lock.json @@ -1,12 +1,12 @@ { "name": "vencord", - "version": "1.8.0", + "version": "1.8.2", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "vencord", - "version": "1.8.0", + "version": "1.8.2", "license": "GPL-3.0-or-later", "dependencies": { "@sapphi-red/web-noise-suppressor": "0.3.3", @@ -770,9 +770,9 @@ } }, "node_modules/@types/diff": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/@types/diff/-/diff-5.2.0.tgz", - "integrity": "sha512-pjJH+02ukgJRW0mViDUA1cdC+wzSgRu0e4cPuogPLAw0i66y62iMP0ZlXoJAmoXrKRZnF3pMDwyKZsgNVlMX4A==", + "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": { @@ -815,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" @@ -2747,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" @@ -4398,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" }, diff --git a/pkgs/by-name/ve/vencord/package.nix b/pkgs/by-name/ve/vencord/package.nix index c40dd9c3bf14b..fb4644dfc45da 100644 --- a/pkgs/by-name/ve/vencord/package.nix +++ b/pkgs/by-name/ve/vencord/package.nix @@ -5,8 +5,8 @@ , buildWebExtension ? false }: let - version = "1.8.0"; - gitHash = "51729c8"; + 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-IE0QV16O3zg8YIu0T8iLYW75ARjlZn0S5P6PLc9S/Rc="; + 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-0Ujs3jnq/jJPd5kI28QOXKsesc6W2rEndDHBvxotAO4="; + npmDepsHash = "sha256-yb9Dbu9Rb1+xV/XiDP49uaQdBP9uM+oimzkeznpGrKw="; npmFlags = [ "--legacy-peer-deps" ]; npmBuildScript = if buildWebExtension then "buildWeb" else "build"; npmBuildFlags = [ "--" "--standalone" "--disable-updater" ]; diff --git a/pkgs/by-name/wo/wowup-cf/package.nix b/pkgs/by-name/wo/wowup-cf/package.nix new file mode 100644 index 0000000000000..2fcbd3600309b --- /dev/null +++ b/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/pkgs/servers/caddy/xcaddy/inject_version_info.diff b/pkgs/by-name/xc/xcaddy/inject_version_info.diff index 4d87aa6878781..4d87aa6878781 100644 --- a/pkgs/servers/caddy/xcaddy/inject_version_info.diff +++ b/pkgs/by-name/xc/xcaddy/inject_version_info.diff diff --git a/pkgs/servers/caddy/xcaddy/default.nix b/pkgs/by-name/xc/xcaddy/package.nix index 69a531c70767a..69a531c70767a 100644 --- a/pkgs/servers/caddy/xcaddy/default.nix +++ b/pkgs/by-name/xc/xcaddy/package.nix diff --git a/pkgs/servers/caddy/xcaddy/use_tmpdir_on_darwin.diff b/pkgs/by-name/xc/xcaddy/use_tmpdir_on_darwin.diff index 064d8feb5a05a..064d8feb5a05a 100644 --- a/pkgs/servers/caddy/xcaddy/use_tmpdir_on_darwin.diff +++ b/pkgs/by-name/xc/xcaddy/use_tmpdir_on_darwin.diff diff --git a/pkgs/by-name/ze/zed-editor/Cargo.lock b/pkgs/by-name/ze/zed-editor/Cargo.lock index fd193939f3de6..094e56b190462 100644 --- a/pkgs/by-name/ze/zed-editor/Cargo.lock +++ b/pkgs/by-name/ze/zed-editor/Cargo.lock @@ -16,7 +16,6 @@ dependencies = [ "project", "smallvec", "ui", - "util", "workspace", ] @@ -284,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", ] @@ -379,9 +378,11 @@ dependencies = [ "assets", "assistant_tooling", "client", + "collections", "editor", "env_logger", "feature_flags", + "fs", "futures 0.3.28", "gpui", "language", @@ -399,6 +400,7 @@ dependencies = [ "serde", "serde_json", "settings", + "story", "theme", "ui", "util", @@ -1479,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", @@ -1500,7 +1502,7 @@ dependencies = [ "mint", "naga", "objc", - "raw-window-handle 0.5.2", + "raw-window-handle 0.6.0", "slab", "wasm-bindgen", "web-sys", @@ -1509,7 +1511,7 @@ 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", @@ -3181,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", @@ -3434,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" @@ -3816,6 +3830,7 @@ dependencies = [ "ctor", "editor", "env_logger", + "futures 0.3.28", "fuzzy", "gpui", "itertools 0.11.0", @@ -4051,6 +4066,7 @@ dependencies = [ "anyhow", "async-tar", "async-trait", + "cocoa", "collections", "fsevent", "futures 0.3.28", @@ -4060,6 +4076,7 @@ dependencies = [ "lazy_static", "libc", "notify", + "objc", "parking_lot", "rope", "serde", @@ -4493,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", @@ -4537,6 +4554,7 @@ dependencies = [ "cosmic-text", "ctor", "derive_more", + "embed-resource", "env_logger", "etagere", "filedescriptor", @@ -4562,7 +4580,6 @@ dependencies = [ "postage", "profiling", "rand 0.8.5", - "raw-window-handle 0.5.2", "raw-window-handle 0.6.0", "refineable", "resvg", @@ -4725,6 +4742,7 @@ dependencies = [ "project", "rpc", "settings", + "shellexpand", "util", ] @@ -5553,12 +5571,9 @@ dependencies = [ "regex", "rope", "rust-embed", - "schemars", "serde", - "serde_derive", "serde_json", "settings", - "shellexpand", "smol", "task", "text", @@ -5569,12 +5584,10 @@ dependencies = [ "tree-sitter-c", "tree-sitter-cpp", "tree-sitter-css", - "tree-sitter-elixir", "tree-sitter-embedded-template", "tree-sitter-go", "tree-sitter-gomod", "tree-sitter-gowork", - "tree-sitter-heex", "tree-sitter-jsdoc", "tree-sitter-json 0.20.0", "tree-sitter-markdown", @@ -5908,6 +5921,7 @@ version = "0.1.0" dependencies = [ "anyhow", "async-recursion 1.0.5", + "collections", "editor", "gpui", "language", @@ -7732,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]] @@ -7975,7 +7989,7 @@ dependencies = [ "wasm-bindgen", "wasm-bindgen-futures", "web-sys", - "winreg", + "winreg 0.50.0", ] [[package]] @@ -8679,6 +8693,7 @@ dependencies = [ "languages", "log", "open_ai", + "parking_lot", "project", "serde", "serde_json", @@ -9484,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", @@ -10632,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", @@ -11102,6 +11117,7 @@ dependencies = [ "futures 0.3.28", "gpui", "indoc", + "itertools 0.11.0", "language", "log", "lsp", @@ -11138,6 +11154,26 @@ 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" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -12211,6 +12247,16 @@ dependencies = [ ] [[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" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -12608,7 +12654,7 @@ dependencies = [ [[package]] name = "zed" -version = "0.133.7" +version = "0.134.4" dependencies = [ "activity_indicator", "anyhow", @@ -12634,7 +12680,6 @@ dependencies = [ "db", "diagnostics", "editor", - "embed-manifest", "env_logger", "extension", "extensions_ui", @@ -12658,6 +12703,7 @@ dependencies = [ "markdown_preview", "menu", "mimalloc", + "nix 0.28.0", "node_runtime", "notifications", "outline", @@ -12680,6 +12726,7 @@ dependencies = [ "tab_switcher", "task", "tasks_ui", + "telemetry_events", "terminal_view", "theme", "theme_selector", @@ -12725,7 +12772,7 @@ dependencies = [ [[package]] name = "zed_dart" -version = "0.0.1" +version = "0.0.2" dependencies = [ "zed_extension_api 0.0.6 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -12738,6 +12785,13 @@ dependencies = [ ] [[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 = [ diff --git a/pkgs/by-name/ze/zed-editor/package.nix b/pkgs/by-name/ze/zed-editor/package.nix index cc33e17a3f350..9680f16798c8c 100644 --- a/pkgs/by-name/ze/zed-editor/package.nix +++ b/pkgs/by-name/ze/zed-editor/package.nix @@ -22,18 +22,17 @@ darwin, makeFontsConf, vulkan-loader, - makeDesktopItem, }: rustPlatform.buildRustPackage rec { pname = "zed"; - version = "0.133.7"; + version = "0.134.4"; src = fetchFromGitHub { owner = "zed-industries"; repo = "zed"; rev = "refs/tags/v${version}"; - hash = "sha256-alhOAcp4aika+v9FWnM2UWVLmzXnAhJD0z2WnYwDN8k="; + hash = "sha256-2/onI/tc5FlwyRuu4Yq3xJYqwNXhnIrCebQQpCKGzfs="; fetchSubmodules = true; }; @@ -41,7 +40,7 @@ rustPlatform.buildRustPackage rec { lockFile = ./Cargo.lock; outputHashes = { "async-pipe-0.1.3" = "sha256-g120X88HGT8P6GNCrzpS5SutALx5H+45Sf4iSSxzctE="; - "blade-graphics-0.4.0" = "sha256-S1PNdQ9YbJgLLsJU1mvDZ3feVDIrZGwU37JqIm+kfcE="; + "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="; @@ -137,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/pkgs/by-name/zp/zpaqfranz/package.nix b/pkgs/by-name/zp/zpaqfranz/package.nix index ba03ab784e383..7908f050bafb0 100644 --- a/pkgs/by-name/zp/zpaqfranz/package.nix +++ b/pkgs/by-name/zp/zpaqfranz/package.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "zpaqfranz"; - version = "59.3"; + version = "59.4"; src = fetchFromGitHub { owner = "fcorbelli"; repo = "zpaqfranz"; rev = finalAttrs.version; - hash = "sha256-Ut4NOcmuXDaGkoXff8cixe5Onb84ztyHlFKH1zDUAZE="; + hash = "sha256-tdkb/qyxpgORC8UcyDl3giGrU1VI0BAriBN7jDNBJzA="; }; nativeBuildInputs = [ diff --git a/pkgs/data/fonts/undefined-medium/default.nix b/pkgs/data/fonts/undefined-medium/default.nix index c1b22f7871173..f981b9f85e29b 100644 --- a/pkgs/data/fonts/undefined-medium/default.nix +++ b/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/pkgs/data/icons/whitesur-cursors/default.nix b/pkgs/data/icons/whitesur-cursors/default.nix index c16efa996d345..167c2b3578b7b 100644 --- a/pkgs/data/icons/whitesur-cursors/default.nix +++ b/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/pkgs/data/themes/kwin-decorations/kde-rounded-corners/default.nix b/pkgs/data/themes/kwin-decorations/kde-rounded-corners/default.nix index 1be8fd1b6b0d6..99c5f7fe3fe0c 100644 --- a/pkgs/data/themes/kwin-decorations/kde-rounded-corners/default.nix +++ b/pkgs/data/themes/kwin-decorations/kde-rounded-corners/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "kde-rounded-corners"; - version = "0.6.2"; + version = "0.6.5"; src = fetchFromGitHub { owner = "matinlotfali"; repo = "KDE-Rounded-Corners"; rev = "v${version}"; - hash = "sha256-4bB1EKK9XUkX8o3ca2dQtJe0UuSDgITVXWnpddTsJDs="; + hash = "sha256-g7gNFv4/ighfxYz/VXF5KvcoT6t4lT5soDLlV3oAKvc="; }; postConfigure = '' diff --git a/pkgs/desktops/gnome/apps/file-roller/default.nix b/pkgs/desktops/gnome/apps/file-roller/default.nix index d32b9bddec8e5..27c189af64cb6 100644 --- a/pkgs/desktops/gnome/apps/file-roller/default.nix +++ b/pkgs/desktops/gnome/apps/file-roller/default.nix @@ -26,11 +26,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "file-roller"; - version = "44.1"; + version = "44.2"; src = fetchurl { url = "mirror://gnome/sources/file-roller/${lib.versions.major finalAttrs.version}/file-roller-${finalAttrs.version}.tar.xz"; - hash = "sha256-JQz1Uc/LEqZwyorflT4GgfHJt27gnZRYsgIDxiYCxIc="; + hash = "sha256-LFcXzn8F+6sTyEe2zjGxsCSIYfp6uPD/Hx4dRdHizfk="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome/apps/gnome-text-editor/default.nix b/pkgs/desktops/gnome/apps/gnome-text-editor/default.nix index 14f4d15a4ce6c..deb3e011c1cda 100644 --- a/pkgs/desktops/gnome/apps/gnome-text-editor/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-text-editor/default.nix @@ -23,11 +23,11 @@ stdenv.mkDerivation rec { pname = "gnome-text-editor"; - version = "46.1"; + version = "46.3"; src = fetchurl { url = "mirror://gnome/sources/gnome-text-editor/${lib.versions.major version}/${pname}-${version}.tar.xz"; - hash = "sha256-jr+gvqEudfXv6sxyG+O4rmUCewJKqB257KuMMSJXous="; + hash = "sha256-AFtIEEqQm+Zq4HRI0rxXBsfRE3gQV6JP9tpVvfMkxz0="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome/core/gnome-calculator/default.nix b/pkgs/desktops/gnome/core/gnome-calculator/default.nix index 059ca6522e835..3b666976681e2 100644 --- a/pkgs/desktops/gnome/core/gnome-calculator/default.nix +++ b/pkgs/desktops/gnome/core/gnome-calculator/default.nix @@ -25,11 +25,11 @@ stdenv.mkDerivation rec { pname = "gnome-calculator"; - version = "46.0"; + version = "46.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-calculator/${lib.versions.major version}/${pname}-${version}.tar.xz"; - hash = "sha256-RGlP2mtiM5I/XBCkjQLSz1ck4BGoqFeJB0yVMQHzO/E="; + hash = "sha256-LTZ1CnOJAIYSLPPwyD5oUXiRWFYVFlMG+hWWqRhmgkc="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome/core/gnome-shell/default.nix b/pkgs/desktops/gnome/core/gnome-shell/default.nix index 9fdffcfd8c920..7b94533f7b602 100644 --- a/pkgs/desktops/gnome/core/gnome-shell/default.nix +++ b/pkgs/desktops/gnome/core/gnome-shell/default.nix @@ -102,6 +102,13 @@ stdenv.mkDerivation (finalAttrs: { 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="; + }) ]; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome/games/aisleriot/default.nix b/pkgs/desktops/gnome/games/aisleriot/default.nix index e0c8ec7fb3ff4..dfba82308d1ac 100644 --- a/pkgs/desktops/gnome/games/aisleriot/default.nix +++ b/pkgs/desktops/gnome/games/aisleriot/default.nix @@ -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 = [ wrapGAppsHook3 meson ninja - appstream-glib pkg-config itstool libxml2 diff --git a/pkgs/desktops/gnome/games/gnome-sudoku/default.nix b/pkgs/desktops/gnome/games/gnome-sudoku/default.nix index a9f0001ae2d78..4c84e0053b279 100644 --- a/pkgs/desktops/gnome/games/gnome-sudoku/default.nix +++ b/pkgs/desktops/gnome/games/gnome-sudoku/default.nix @@ -21,11 +21,11 @@ stdenv.mkDerivation rec { pname = "gnome-sudoku"; - version = "46.0"; + version = "46.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-sudoku/${lib.versions.major version}/${pname}-${version}.tar.xz"; - hash = "sha256-d8TnjYhvOxRFav7w+5aPLqAa01cDzEhSP41yR4P/pq8="; + hash = "sha256-ObtDHxCjH1Vq9im2aFyG1Qyknymhuv6GIZwgwVUQcKY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/compilers/ecl/default.nix b/pkgs/development/compilers/ecl/default.nix index 26f1ec471a597..c11f471641dad 100644 --- a/pkgs/development/compilers/ecl/default.nix +++ b/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/pkgs/development/compilers/llvm/common/llvm/default.nix b/pkgs/development/compilers/llvm/common/llvm/default.nix index 0716453c34c94..8747215cce0d6 100644 --- a/pkgs/development/compilers/llvm/common/llvm/default.nix +++ b/pkgs/development/compilers/llvm/common/llvm/default.nix @@ -28,7 +28,7 @@ , sysctl , buildLlvmTools , debugVersion ? false -, doCheck ? (if lib.versionOlder release_version "15" then stdenv.isLinux else true) +, doCheck ? !stdenv.isAarch32 && (if lib.versionOlder release_version "15" then stdenv.isLinux else true) && (!stdenv.isx86_32 /* TODO: why */) && (!stdenv.hostPlatform.isMusl) && (stdenv.hostPlatform == stdenv.buildPlatform) , enableManpages ? false diff --git a/pkgs/development/compilers/osl/default.nix b/pkgs/development/compilers/osl/default.nix index c9c849f0a68a3..d05d01bc6c078 100644 --- a/pkgs/development/compilers/osl/default.nix +++ b/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/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix index 4116952199719..75ead6184aa88 100644 --- a/pkgs/development/compilers/sbcl/default.nix +++ b/pkgs/development/compilers/sbcl/default.nix @@ -113,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}) '' diff --git a/pkgs/development/compilers/sbcl/dynamic-space-size-envvar-feature.patch b/pkgs/development/compilers/sbcl/dynamic-space-size-envvar-feature.patch new file mode 100644 index 0000000000000..f1596958a6f8f --- /dev/null +++ b/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 <hraban@0brg.net> +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/pkgs/development/compilers/sbcl/dynamic-space-size-envvar-tests.patch b/pkgs/development/compilers/sbcl/dynamic-space-size-envvar-tests.patch new file mode 100644 index 0000000000000..1a507cc90381a --- /dev/null +++ b/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 <hraban@0brg.net> +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 <<EOF ++(assert (<= 0 (- (* 234 1024 1024) (sb-ext:dynamic-space-size)) 65536)) ++EOF ++ ++NIX_SBCL_DYNAMIC_SPACE_SIZE=555mb run_sbcl_with_args --dynamic-space-size 234mb --script <<EOF ++(assert (<= 0 (- (* 234 1024 1024) (sb-ext:dynamic-space-size)) 65536)) ++EOF ++ ++run_sbcl_with_args --dynamic-space-size 234mb --script <<EOF ++(assert (<= 0 (- (* 234 1024 1024) (sb-ext:dynamic-space-size)) 65536)) ++EOF ++ ++exit $EXIT_TEST_WIN +diff --git a/tests/save7.test.sh b/tests/save7.test.sh +index f9225543b..3c35e7b31 100644 +--- a/tests/save7.test.sh ++++ b/tests/save7.test.sh +@@ -59,9 +59,9 @@ run_sbcl_with_core "$tmpcore" --noinform --control-stack-size 640KB \ + (assert (eql (extern-alien "dynamic_values_bytes" (unsigned 32)) + (* 5000 sb-vm:n-word-bytes))) + ; allow slight shrinkage if heap relocation has to adjust for alignment +- (defun dynamic-space-size-good-p () +- (<= 0 (- (* 260 1048576) (dynamic-space-size)) 65536)) +- (assert (dynamic-space-size-good-p)) ++ (defun dynamic-space-size-good-p (expected-mb) ++ (<= 0 (- (* expected-mb 1024 1024) (dynamic-space-size)) 65536)) ++ (assert (dynamic-space-size-good-p 260)) + (save-lisp-and-die "${tmpcore}2" :executable t :save-runtime-options t) + EOF + chmod u+x "${tmpcore}2" +@@ -70,15 +70,42 @@ echo "::: INFO: prepared test core" + (when (and (eql (extern-alien "thread_control_stack_size" unsigned) (* 640 1024)) + (eql (extern-alien "dynamic_values_bytes" (unsigned 32)) + (* 5000 sb-vm:n-word-bytes)) +- (dynamic-space-size-good-p)) ++ (dynamic-space-size-good-p 260)) + (exit :code 42)) + EOF + status=$? +-rm "$tmpcore" "${tmpcore}2" + if [ $status -ne 42 ]; then + echo "re-saved executable used wrong memory size options" + exit 1 + fi + echo "::: Success" + ++echo "::: Running :DYNAMIC-SPACE-SIZE-ENV" ++NIX_SBCL_DYNAMIC_SPACE_SIZE=432MB ./"${tmpcore}2" --no-userinit --no-sysinit --noprint <<EOF ++ (when (dynamic-space-size-good-p 432) ++ (exit :code 42)) ++EOF ++status=$? ++if [ $status -ne 42 ]; then ++ echo "re-saved executable should have prioritized memory specification from env" ++ exit 1 ++fi ++echo "::: Success" ++ ++echo "::: Running :DYNAMIC-SPACE-SIZE-PRECEDENCE" ++NIX_SBCL_DYNAMIC_SPACE_SIZE=432MB ./"${tmpcore}2" --dynamic-space-size 333MB \ ++ --no-userinit --no-sysinit --noprint <<EOF ++ (when (dynamic-space-size-good-p 333)) ++ (exit :code 42)) ++EOF ++status=$? ++rm "$tmpcore" "${tmpcore}2" ++if [ $status -ne 42 ]; then ++ echo "re-saved executable should have prioritized memory specification from arg" ++ exit 1 ++fi ++echo "::: Success" ++ ++ ++ + exit $EXIT_TEST_WIN +-- +2.44.0 + diff --git a/pkgs/development/compilers/terra/default.nix b/pkgs/development/compilers/terra/default.nix index 3f6934f04212c..ae81adf5f5b0a 100644 --- a/pkgs/development/compilers/terra/default.nix +++ b/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/pkgs/development/interpreters/emilua/default.nix b/pkgs/development/interpreters/emilua/default.nix index 97fc3089404aa..e71c47ae59cbc 100644 --- a/pkgs/development/interpreters/emilua/default.nix +++ b/pkgs/development/interpreters/emilua/default.nix @@ -1,46 +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 -, makeWrapper +{ + 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.7.2"; + version = "0.7.3"; src = fetchFromGitLab { - owner = "emilua"; - repo = "emilua"; - rev = "v${version}"; - hash = "sha256-gt+THEr3nilweDEDmEMwIsU4i9own4ICJlZD+z8XWRQ="; + owner = "emilua"; + repo = "emilua"; + rev = "v${version}"; + hash = "sha256-j8ohhqHjSBgc4Xk9PcQNrbADmsz4VH2zCv+UNqiCv4I="; }; buildInputs = [ @@ -83,7 +84,6 @@ stdenv.mkDerivation rec { (lib.mesonBool "enable_tests" true) (lib.mesonBool "enable_manpages" true) (lib.mesonOption "version_suffix" "-nixpkgs1") - (lib.mesonOption "ipc_actor_msg_max_members_number" "40") ]; postPatch = '' diff --git a/pkgs/development/interpreters/php/8.2.nix b/pkgs/development/interpreters/php/8.2.nix index d839e372570ad..a63f1391616da 100644 --- a/pkgs/development/interpreters/php/8.2.nix +++ b/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/pkgs/development/interpreters/php/8.3.nix b/pkgs/development/interpreters/php/8.3.nix index d7ac07c1fb553..1da9841f78941 100644 --- a/pkgs/development/interpreters/php/8.3.nix +++ b/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/pkgs/development/libraries/faudio/default.nix b/pkgs/development/libraries/faudio/default.nix index fc71ced98101b..743ef904dcdf9 100644 --- a/pkgs/development/libraries/faudio/default.nix +++ b/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/pkgs/development/libraries/gstreamer/icamerasrc/default.nix b/pkgs/development/libraries/gstreamer/icamerasrc/default.nix index 4d6c5671f0e28..da74ec243cefa 100644 --- a/pkgs/development/libraries/gstreamer/icamerasrc/default.nix +++ b/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/pkgs/development/libraries/gtksourceview/5.x.nix b/pkgs/development/libraries/gtksourceview/5.x.nix index 93f5bb519495d..4b5f52c22b771 100644 --- a/pkgs/development/libraries/gtksourceview/5.x.nix +++ b/pkgs/development/libraries/gtksourceview/5.x.nix @@ -115,5 +115,7 @@ stdenv.mkDerivation (finalAttrs: { 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/pkgs/development/libraries/ipu6-camera-hal/default.nix b/pkgs/development/libraries/ipu6-camera-hal/default.nix index 3ec63fd0807d3..ff490414da858 100644 --- a/pkgs/development/libraries/ipu6-camera-hal/default.nix +++ b/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/pkgs/development/libraries/java/commons/io/default.nix b/pkgs/development/libraries/java/commons/io/default.nix index 4c010829c6ff4..2547090523486 100644 --- a/pkgs/development/libraries/java/commons/io/default.nix +++ b/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/pkgs/development/libraries/java/commons/logging/default.nix b/pkgs/development/libraries/java/commons/logging/default.nix index 085efc6e52b5f..f7debe8a7bdc7 100644 --- a/pkgs/development/libraries/java/commons/logging/default.nix +++ b/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/pkgs/development/libraries/libowlevelzs/default.nix b/pkgs/development/libraries/libowlevelzs/default.nix index 7bf8386f252f0..e3a4ffb11e8e8 100644 --- a/pkgs/development/libraries/libowlevelzs/default.nix +++ b/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 = with lib.maintainers; [ sigmanificient ]; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/libsolv/default.nix b/pkgs/development/libraries/libsolv/default.nix index 60e7da2907263..e044037eb79d8 100644 --- a/pkgs/development/libraries/libsolv/default.nix +++ b/pkgs/development/libraries/libsolv/default.nix @@ -17,14 +17,14 @@ }: stdenv.mkDerivation rec { - version = "0.7.28"; + version = "0.7.29"; pname = "libsolv"; src = fetchFromGitHub { owner = "openSUSE"; repo = "libsolv"; rev = version; - hash = "sha256-cL7SDwCzXM2qJQfiu/3nfAiFbcFNn1YXD23Sl3n9nzY="; + hash = "sha256-867sCGFvKib1As9BCiCi6LYVrLUK0pjtM5Bw9Yuu0D8="; }; cmakeFlags = [ diff --git a/pkgs/development/libraries/liburcu/default.nix b/pkgs/development/libraries/liburcu/default.nix index 722a1534e92ca..b1a091d12b3d9 100644 --- a/pkgs/development/libraries/liburcu/default.nix +++ b/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/pkgs/development/libraries/libxcrypt/default.nix b/pkgs/development/libraries/libxcrypt/default.nix index 067141883977d..d71cb7027570a 100644 --- a/pkgs/development/libraries/libxcrypt/default.nix +++ b/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/pkgs/development/libraries/malcontent/default.nix b/pkgs/development/libraries/malcontent/default.nix index 34d1731e8a097..f346906eadc23 100644 --- a/pkgs/development/libraries/malcontent/default.nix +++ b/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/pkgs/development/libraries/physics/fastnlo-toolkit/default.nix b/pkgs/development/libraries/physics/fastnlo-toolkit/default.nix index 66a3bf5128f5d..3c781689bbf83 100644 --- a/pkgs/development/libraries/physics/fastnlo-toolkit/default.nix +++ b/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/pkgs/development/libraries/rutabaga_gfx/default.nix b/pkgs/development/libraries/rutabaga_gfx/default.nix index 6875002727357..9b8f5bec42f37 100644 --- a/pkgs/development/libraries/rutabaga_gfx/default.nix +++ b/pkgs/development/libraries/rutabaga_gfx/default.nix @@ -54,15 +54,23 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-wuF3Isrp+u5J8jPQoPsIOWYGNKLSNa2pLfvladAWkLs="; }; - # make install always rebuilds - dontBuild = true; + CARGO_BUILD_TARGET = stdenv.hostPlatform.rust.rustcTargetSpec; + "CARGO_TARGET_${stdenv.hostPlatform.rust.cargoEnvVarTarget}_LINKER" = + "${stdenv.cc.targetPrefix}cc"; - makeFlags = [ "prefix=$(out)" ]; - - preInstall = '' + postConfigure = '' cd rutabaga_gfx/ffi + substituteInPlace Makefile --replace-fail pkg-config "$PKG_CONFIG" ''; + # make install always rebuilds + dontBuild = true; + + makeFlags = [ + "prefix=$(out)" + "OUT=target/${stdenv.hostPlatform.rust.cargoShortTarget}/release" + ]; + meta = with lib; { homepage = "https://crosvm.dev/book/appendix/rutabaga_gfx.html"; description = "cross-platform abstraction for GPU and display virtualization"; diff --git a/pkgs/development/libraries/ucl/default.nix b/pkgs/development/libraries/ucl/default.nix index 048f35868cdad..d8e05e9374bfa 100644 --- a/pkgs/development/libraries/ucl/default.nix +++ b/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/pkgs/development/libraries/webrtc-audio-processing/default.nix b/pkgs/development/libraries/webrtc-audio-processing/default.nix index 7e9fe3fa4a399..b400893067353 100644 --- a/pkgs/development/libraries/webrtc-audio-processing/default.nix +++ b/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/pkgs/development/python-modules/accelerate/default.nix b/pkgs/development/python-modules/accelerate/default.nix index 7923c96af814f..61b3c53e834cb 100644 --- a/pkgs/development/python-modules/accelerate/default.nix +++ b/pkgs/development/python-modules/accelerate/default.nix @@ -4,6 +4,7 @@ , fetchFromGitHub , pythonAtLeast , pythonOlder +, llvmPackages , pytest7CheckHook , setuptools , numpy @@ -21,21 +22,25 @@ buildPythonPackage rec { pname = "accelerate"; - version = "0.29.3"; + 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-oQGb/hlMN8JfwEyWufBvMk2Z1FMSl1lsdIbgZ3ZMdF8="; + hash = "sha256-E20pI5BrcTrMYrhriuOUl5/liSaQQy6eqRyCoauwb9Q="; }; - nativeBuildInputs = [ setuptools ]; + buildInputs = [ + llvmPackages.openmp + ]; + + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ numpy packaging psutil @@ -103,6 +108,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/pkgs/development/python-modules/adafruit-platformdetect/default.nix b/pkgs/development/python-modules/adafruit-platformdetect/default.nix index bee4d68d5d738..3e220a23092ff 100644 --- a/pkgs/development/python-modules/adafruit-platformdetect/default.nix +++ b/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/pkgs/development/python-modules/adext/default.nix b/pkgs/development/python-modules/adext/default.nix index c5a05d19bee85..8a7345613de79 100644 --- a/pkgs/development/python-modules/adext/default.nix +++ b/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/pkgs/development/python-modules/aeppl/default.nix b/pkgs/development/python-modules/aeppl/default.nix index 1633be12bb97a..514e585d60338 100644 --- a/pkgs/development/python-modules/aeppl/default.nix +++ b/pkgs/development/python-modules/aeppl/default.nix @@ -1,29 +1,34 @@ { lib -, aesara , buildPythonPackage +, pythonOlder , fetchFromGitHub -, numdifftools +, setuptools +, aesara , numpy -, pytestCheckHook -, pythonOlder , 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/pkgs/development/python-modules/aesara/default.nix b/pkgs/development/python-modules/aesara/default.nix index 589799c1b848f..edf3f989ecbc1 100644 --- a/pkgs/development/python-modules/aesara/default.nix +++ b/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 <class 'NoneType'> + "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/pkgs/development/python-modules/albumentations/default.nix b/pkgs/development/python-modules/albumentations/default.nix index 1de36e510197b..7e15fcf6c116a 100644 --- a/pkgs/development/python-modules/albumentations/default.nix +++ b/pkgs/development/python-modules/albumentations/default.nix @@ -1,19 +1,21 @@ { 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 { @@ -23,9 +25,11 @@ buildPythonPackage rec { disabled = pythonOlder "3.8"; - src = fetchPypi { - inherit pname version; - hash = "sha256-VNpClOBdoaQOqU92Mm/Z5Q7P+fZzR+m43SFA9pSi1M0="; + 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/pkgs/development/python-modules/app-model/default.nix b/pkgs/development/python-modules/app-model/default.nix index 7dc1c65349eaf..bf2130e224176 100644 --- a/pkgs/development/python-modules/app-model/default.nix +++ b/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/pkgs/development/python-modules/apprise/default.nix b/pkgs/development/python-modules/apprise/default.nix index 8b7dcea1f3525..b29ddeedad7fe 100644 --- a/pkgs/development/python-modules/apprise/default.nix +++ b/pkgs/development/python-modules/apprise/default.nix @@ -1,38 +1,37 @@ -{ lib -, babel -, buildPythonPackage -, click -, cryptography -, fetchPypi -, gntp -, installShellFiles -, markdown -, paho-mqtt -, pytest-mock -, pytest-xdist -, pytestCheckHook -, pythonOlder -, pyyaml -, requests -, requests-oauthlib -, setuptools +{ + 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"; + 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 @@ -70,9 +69,7 @@ buildPythonPackage rec { installManPage packaging/man/apprise.1 ''; - pythonImportsCheck = [ - "apprise" - ]; + pythonImportsCheck = [ "apprise" ]; meta = with lib; { description = "Push Notifications that work with just about every platform"; diff --git a/pkgs/development/python-modules/asyncio-dgram/default.nix b/pkgs/development/python-modules/asyncio-dgram/default.nix index f999cd3b3b344..cdd6ac9b97811 100644 --- a/pkgs/development/python-modules/asyncio-dgram/default.nix +++ b/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/pkgs/development/python-modules/augmax/default.nix b/pkgs/development/python-modules/augmax/default.nix index 2ab159cfc6f8d..879bffb8a0d0a 100644 --- a/pkgs/development/python-modules/augmax/default.nix +++ b/pkgs/development/python-modules/augmax/default.nix @@ -1,6 +1,6 @@ { buildPythonPackage , einops -, fetchFromGitHub +, fetchPypi , jax , jaxlib , lib @@ -10,16 +10,17 @@ buildPythonPackage rec { pname = "augmax"; - version = "0.3.1"; + version = "0.3.2"; pyproject = true; disbaled = pythonOlder "3.6"; - src = fetchFromGitHub { - owner = "khdlr"; - repo = "augmax"; - rev = "refs/tags/v${version}"; - hash = "sha256-hDNNoE7KVaH3jrXZA4A8f0UoQJPl6KHA3XwMc3Ccohk="; + # Using fetchPypi because the latest version was not tagged on GitHub. + # Switch back to fetchFromGitHub when a tag will be available + # https://github.com/khdlr/augmax/issues/8 + src = fetchPypi { + inherit pname version; + hash = "sha256-pf1DTaHA7D+s2rqwwGYlJrJOI7fok+WOvOCtZhOOGHo="; }; nativeBuildInputs = [ @@ -37,7 +38,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/pkgs/development/python-modules/beancount-black/default.nix b/pkgs/development/python-modules/beancount-black/default.nix index f1e1ee3a4b02b..0b4eb2ba69967 100644 --- a/pkgs/development/python-modules/beancount-black/default.nix +++ b/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/pkgs/development/python-modules/beancount-parser/default.nix b/pkgs/development/python-modules/beancount-parser/default.nix index b7fe986209fba..f3319a58b06e7 100644 --- a/pkgs/development/python-modules/beancount-parser/default.nix +++ b/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/pkgs/development/python-modules/bellows/default.nix b/pkgs/development/python-modules/bellows/default.nix index 56c13317d7970..5d4c388033836 100644 --- a/pkgs/development/python-modules/bellows/default.nix +++ b/pkgs/development/python-modules/bellows/default.nix @@ -1,18 +1,19 @@ -{ lib -, async-timeout -, buildPythonPackage -, click -, click-log -, fetchFromGitHub -, 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 { @@ -35,9 +36,7 @@ buildPythonPackage rec { --replace-fail 'dynamic = ["version"]' 'version = "${version}"' ''; - build-system = [ - setuptools - ]; + build-system = [ setuptools ]; dependencies = [ click @@ -46,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 @@ -56,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/pkgs/development/python-modules/binance-connector/default.nix b/pkgs/development/python-modules/binance-connector/default.nix new file mode 100644 index 0000000000000..c8d3b044b5582 --- /dev/null +++ b/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/pkgs/development/python-modules/bloodyad/default.nix b/pkgs/development/python-modules/bloodyad/default.nix index 11d26f32fbae8..47ff7565a297a 100644 --- a/pkgs/development/python-modules/bloodyad/default.nix +++ b/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/pkgs/development/python-modules/boto3-stubs/default.nix b/pkgs/development/python-modules/boto3-stubs/default.nix index bb0a67a7ede09..6019b702efd55 100644 --- a/pkgs/development/python-modules/boto3-stubs/default.nix +++ b/pkgs/development/python-modules/boto3-stubs/default.nix @@ -366,7 +366,7 @@ buildPythonPackage rec { pname = "boto3-stubs"; - version = "1.34.101"; + version = "1.34.103"; pyproject = true; disabled = pythonOlder "3.7"; @@ -374,7 +374,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "boto3_stubs"; inherit version; - hash = "sha256-GexON+k1FlMZID3tULcKLLxrVUscVMzS9fZNgD+rB4U="; + hash = "sha256-MxMTEnOQKpgEYyL4wZkl7NUykk66ZOm/wFKNBGrrbYw="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/bsddb3/default.nix b/pkgs/development/python-modules/bsddb3/default.nix index 4edc9e1524b43..4e617c546985f 100644 --- a/pkgs/development/python-modules/bsddb3/default.nix +++ b/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/pkgs/development/python-modules/btrfs/default.nix b/pkgs/development/python-modules/btrfs/default.nix index a534257c6dbef..66a7a05676a96 100644 --- a/pkgs/development/python-modules/btrfs/default.nix +++ b/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/pkgs/development/python-modules/cgen/default.nix b/pkgs/development/python-modules/cgen/default.nix index 966a6b7ff159f..d2a4878f240f0 100644 --- a/pkgs/development/python-modules/cgen/default.nix +++ b/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/pkgs/development/python-modules/chromadb/default.nix b/pkgs/development/python-modules/chromadb/default.nix index 2042758efd8af..471b6111a93d3 100644 --- a/pkgs/development/python-modules/chromadb/default.nix +++ b/pkgs/development/python-modules/chromadb/default.nix @@ -132,6 +132,7 @@ buildPythonPackage rec { pytestFlagsArray = [ "-x" ]; preCheck = '' + (($(ulimit -n) < 1024)) && ulimit -n 1024 export HOME=$(mktemp -d) ''; diff --git a/pkgs/development/python-modules/contourpy/default.nix b/pkgs/development/python-modules/contourpy/default.nix index 5e12a4531b33c..1f606a932d2ea 100644 --- a/pkgs/development/python-modules/contourpy/default.nix +++ b/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/pkgs/development/python-modules/courlan/default.nix b/pkgs/development/python-modules/courlan/default.nix index bd73aad1977d8..fd2cfc01b6e8d 100644 --- a/pkgs/development/python-modules/courlan/default.nix +++ b/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/pkgs/development/python-modules/dask-jobqueue/default.nix b/pkgs/development/python-modules/dask-jobqueue/default.nix index dc668ea2639ab..69ef4a56f9623 100644 --- a/pkgs/development/python-modules/dask-jobqueue/default.nix +++ b/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/pkgs/development/python-modules/dataclasses-json/default.nix b/pkgs/development/python-modules/dataclasses-json/default.nix index 202b4ebb6dedb..05f5eb06e0984 100644 --- a/pkgs/development/python-modules/dataclasses-json/default.nix +++ b/pkgs/development/python-modules/dataclasses-json/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchFromGitHub , hypothesis -, marshmallow-enum +, marshmallow , poetry-core , poetry-dynamic-versioning , pytestCheckHook @@ -36,7 +36,7 @@ buildPythonPackage rec { dependencies = [ typing-inspect - marshmallow-enum + marshmallow ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/dbutils/default.nix b/pkgs/development/python-modules/dbutils/default.nix index 6ad3438704700..49d3d00c110aa 100644 --- a/pkgs/development/python-modules/dbutils/default.nix +++ b/pkgs/development/python-modules/dbutils/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, setuptools , pytestCheckHook , pythonOlder }: @@ -8,7 +9,7 @@ buildPythonPackage rec { pname = "dbutils"; version = "3.1.0"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.6"; @@ -18,6 +19,10 @@ buildPythonPackage rec { 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/pkgs/development/python-modules/deebot-client/default.nix b/pkgs/development/python-modules/deebot-client/default.nix index 6ee1ae0cc4ee1..17edaa445de76 100644 --- a/pkgs/development/python-modules/deebot-client/default.nix +++ b/pkgs/development/python-modules/deebot-client/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "deebot-client"; - version = "7.1.0"; + version = "7.2.0"; pyproject = true; disabled = pythonOlder "3.12"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "DeebotUniverse"; repo = "client.py"; rev = "refs/tags/${version}"; - hash = "sha256-x4P0hFsyo/QLQA+MOecbiKfZ/5TL6WKWXftsLz9XBA4="; + hash = "sha256-5GALvd9p+ksxWqkfkSd07mPNzQSbdeGzrUjQU2nWs3g="; }; build-system = [ diff --git a/pkgs/development/python-modules/desktop-notifier/default.nix b/pkgs/development/python-modules/desktop-notifier/default.nix index 708c971943ec8..f406bcd4cc5be 100644 --- a/pkgs/development/python-modules/desktop-notifier/default.nix +++ b/pkgs/development/python-modules/desktop-notifier/default.nix @@ -11,8 +11,8 @@ buildPythonPackage rec { pname = "desktop-notifier"; - version = "3.5.6"; - format = "pyproject"; + version = "4.0.0"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -20,14 +20,14 @@ 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 diff --git a/pkgs/development/python-modules/diffusers/default.nix b/pkgs/development/python-modules/diffusers/default.nix index 39464efe47fdb..19fe676abb644 100644 --- a/pkgs/development/python-modules/diffusers/default.nix +++ b/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/pkgs/development/python-modules/dissect-executable/default.nix b/pkgs/development/python-modules/dissect-executable/default.nix index c6abdd5ee6f66..c8d9c456fa990 100644 --- a/pkgs/development/python-modules/dissect-executable/default.nix +++ b/pkgs/development/python-modules/dissect-executable/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "dissect-executable"; - version = "1.5"; + version = "1.6"; pyproject = true; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.executable"; rev = "refs/tags/${version}"; - hash = "sha256-aAalU0TUqXc13WnxJvirG3QzQyMstecOfnXMdFT8IzU="; + hash = "sha256-b8xPOIUMn6JdYlvuoV5UeBdyISh6CC2Gh6E6U5ZZ7qY="; }; build-system = [ diff --git a/pkgs/development/python-modules/docplex/default.nix b/pkgs/development/python-modules/docplex/default.nix index 29395e91a5f1d..dde6772864b3a 100644 --- a/pkgs/development/python-modules/docplex/default.nix +++ b/pkgs/development/python-modules/docplex/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchPypi , isPy27 +, setuptools , futures ? null , docloud , requests @@ -10,7 +11,7 @@ buildPythonPackage rec { pname = "docplex"; version = "2.27.239"; - format = "setuptools"; + pyproject = true; # No source available from official repo src = fetchPypi { @@ -18,6 +19,15 @@ buildPythonPackage rec { 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/pkgs/development/python-modules/docstr-coverage/default.nix b/pkgs/development/python-modules/docstr-coverage/default.nix index b9a6080fa7df8..603e826908b92 100644 --- a/pkgs/development/python-modules/docstr-coverage/default.nix +++ b/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/pkgs/development/python-modules/dropbox/default.nix b/pkgs/development/python-modules/dropbox/default.nix index 762b9b7ff8cf2..b090f81da9757 100644 --- a/pkgs/development/python-modules/dropbox/default.nix +++ b/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/pkgs/development/python-modules/duckduckgo-search/default.nix b/pkgs/development/python-modules/duckduckgo-search/default.nix index 708762bb2622f..a06c16586b0a3 100644 --- a/pkgs/development/python-modules/duckduckgo-search/default.nix +++ b/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/pkgs/development/python-modules/fastbencode/default.nix b/pkgs/development/python-modules/fastbencode/default.nix index 369d991aaa939..92eb19e0a0eec 100644 --- a/pkgs/development/python-modules/fastbencode/default.nix +++ b/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,6 +33,7 @@ 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; [ ]; }; diff --git a/pkgs/development/python-modules/flask-appbuilder/default.nix b/pkgs/development/python-modules/flask-appbuilder/default.nix index 3598500e37f56..2e7f5fb80850c 100644 --- a/pkgs/development/python-modules/flask-appbuilder/default.nix +++ b/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/pkgs/development/python-modules/glean-parser/default.nix b/pkgs/development/python-modules/glean-parser/default.nix index 7b0e92f8ffe1a..011f63c6fdd32 100644 --- a/pkgs/development/python-modules/glean-parser/default.nix +++ b/pkgs/development/python-modules/glean-parser/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "glean-parser"; - version = "14.1.0"; + version = "14.1.1"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "glean_parser"; inherit version; - hash = "sha256-828KUT9B09cOQrpLqfPpkxb63IounEqNOs3WWq6vGVU="; + hash = "sha256-bYqUNkB4/0W/+0+1G6/Ur5znDD5IlKFIc4gVNA0vAOg="; }; postPatch = '' diff --git a/pkgs/development/python-modules/glob2/default.nix b/pkgs/development/python-modules/glob2/default.nix index 5d75da953ed59..24658f2f78744 100644 --- a/pkgs/development/python-modules/glob2/default.nix +++ b/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/pkgs/development/python-modules/goodwe/default.nix b/pkgs/development/python-modules/goodwe/default.nix index 41028b942bd1e..31a750c9ae589 100644 --- a/pkgs/development/python-modules/goodwe/default.nix +++ b/pkgs/development/python-modules/goodwe/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "goodwe"; - version = "0.3.4"; + 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-RIiJs2drXOb4irs3kTDelP+Cuv94SJ+nwBrkHbqI/Jc="; + hash = "sha256-5Z8eHhCqfCTswS0C56z9TUQfoIdifuqcdWOupVlOJt8="; }; postPatch = '' diff --git a/pkgs/development/python-modules/google-ai-generativelanguage/default.nix b/pkgs/development/python-modules/google-ai-generativelanguage/default.nix index f19df6658fd22..37194dc41b015 100644 --- a/pkgs/development/python-modules/google-ai-generativelanguage/default.nix +++ b/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/pkgs/development/python-modules/gradio/client.nix b/pkgs/development/python-modules/gradio/client.nix index 96c293d399c55..bbf4d468ce69a 100644 --- a/pkgs/development/python-modules/gradio/client.nix +++ b/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,7 +52,7 @@ buildPythonPackage rec { "websockets" ]; - nativeBuildInputs = [ + build-system = [ hatchling hatch-requirements-txt hatch-fancy-pypi-readme diff --git a/pkgs/development/python-modules/gradio/default.nix b/pkgs/development/python-modules/gradio/default.nix index 0d4838e372de6..d5fc508e16229 100644 --- a/pkgs/development/python-modules/gradio/default.nix +++ b/pkgs/development/python-modules/gradio/default.nix @@ -62,7 +62,7 @@ buildPythonPackage rec { pname = "gradio"; - version = "4.27.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-617zutFhS8NGO4+fcALH8aKbk+reGC65DNWKVVKiWEw="; + hash = "sha256-17KT0b9kBO+xLgIgxfpwjETDoRM4aTJPlJv7HjkJXjo="; }; # fix packaging.ParserSyntaxError, which can't handle comments @@ -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/pkgs/development/python-modules/hawkauthlib/default.nix b/pkgs/development/python-modules/hawkauthlib/default.nix index 9df850b788297..b7c6c73820a25 100644 --- a/pkgs/development/python-modules/hawkauthlib/default.nix +++ b/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/pkgs/development/python-modules/homematicip/default.nix b/pkgs/development/python-modules/homematicip/default.nix index 34016262e93bb..f4aa29cfcb8d9 100644 --- a/pkgs/development/python-modules/homematicip/default.nix +++ b/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/pkgs/development/python-modules/html-text/default.nix b/pkgs/development/python-modules/html-text/default.nix index 00d2fb426d381..43d7ca228bb0e 100644 --- a/pkgs/development/python-modules/html-text/default.nix +++ b/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/pkgs/development/python-modules/htseq/default.nix b/pkgs/development/python-modules/htseq/default.nix index 9d69a8bfef542..caa47f5197d60 100644 --- a/pkgs/development/python-modules/htseq/default.nix +++ b/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/pkgs/development/python-modules/igraph/default.nix b/pkgs/development/python-modules/igraph/default.nix index 98f38528c1442..8aa1583cc8a87 100644 --- a/pkgs/development/python-modules/igraph/default.nix +++ b/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/pkgs/development/python-modules/ihm/default.nix b/pkgs/development/python-modules/ihm/default.nix index 2cfb69178b109..3991ce9a4339a 100644 --- a/pkgs/development/python-modules/ihm/default.nix +++ b/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/pkgs/development/python-modules/intbitset/default.nix b/pkgs/development/python-modules/intbitset/default.nix index 96e1698002f01..b3e2294f1a7e7 100644 --- a/pkgs/development/python-modules/intbitset/default.nix +++ b/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/pkgs/development/python-modules/jenkins-job-builder/default.nix b/pkgs/development/python-modules/jenkins-job-builder/default.nix index 852b529e8bcc1..2ed276bfaef37 100644 --- a/pkgs/development/python-modules/jenkins-job-builder/default.nix +++ b/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/pkgs/development/python-modules/kornia-rs/default.nix b/pkgs/development/python-modules/kornia-rs/default.nix index 57aaa325d2b61..f493d74a6b8dd 100644 --- a/pkgs/development/python-modules/kornia-rs/default.nix +++ b/pkgs/development/python-modules/kornia-rs/default.nix @@ -1,10 +1,12 @@ { lib +, stdenv , fetchFromGitHub , buildPythonPackage , rustPlatform , cmake , nasm , substituteAll +, libiconv }: buildPythonPackage rec { @@ -26,6 +28,8 @@ buildPythonPackage rec { nasm # Only for dependencies. ]; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin libiconv; + cargoRoot = "py-kornia"; cargoDeps = rustPlatform.importCargoLock { lockFile = ./Cargo.lock; diff --git a/pkgs/development/python-modules/langchain-community/default.nix b/pkgs/development/python-modules/langchain-community/default.nix index 90619042619c8..e8e028570abd9 100644 --- a/pkgs/development/python-modules/langchain-community/default.nix +++ b/pkgs/development/python-modules/langchain-community/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "langchain-community"; - version = "0.0.37"; + 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-2ytYKbsgvFsEwSa2kUPbwxqIDpSelBEMI2ssF2kGiJ8="; + hash = "sha256-En/Et1vGe2L+gnxmwC5xWnMP74/mm9ICPUZrqwa1gQ0="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/langchain-core/default.nix b/pkgs/development/python-modules/langchain-core/default.nix index 746d690984be5..8cfa8cafd9ee1 100644 --- a/pkgs/development/python-modules/langchain-core/default.nix +++ b/pkgs/development/python-modules/langchain-core/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "langchain-core"; - version = "0.1.51"; + 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-9+oRb5Ob6edMOFuvldbITNekArWcLBiT/AVL+Yq778I="; + hash = "sha256-CEw/xFL1ppZsKKs+xdvIuNJvw/YzeAc5KPTinZC2OT8="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/langchain/default.nix b/pkgs/development/python-modules/langchain/default.nix index ddcb01d7c4506..7e357a070ea0f 100644 --- a/pkgs/development/python-modules/langchain/default.nix +++ b/pkgs/development/python-modules/langchain/default.nix @@ -160,6 +160,8 @@ buildPythonPackage rec { "test_generic_fake_chat_model" # Test is outdated "test_serializable_mapping" + "test_person" + "test_aliases_hidden" ]; pythonImportsCheck = [ "langchain" ]; diff --git a/pkgs/development/python-modules/langsmith/default.nix b/pkgs/development/python-modules/langsmith/default.nix index e42a344262a39..fe26d306a3985 100644 --- a/pkgs/development/python-modules/langsmith/default.nix +++ b/pkgs/development/python-modules/langsmith/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "langsmith"; - version = "0.1.54"; + version = "0.1.57"; pyproject = true; disabled = pythonOlder "3.8"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "langchain-ai"; repo = "langsmith-sdk"; rev = "refs/tags/v${version}"; - hash = "sha256-hg1xfqptjeJHxbiGfuGeka7lpClrb9nxP/RSUYr2/0k="; + hash = "sha256-L725AfkmBEe44LkJ0y6PdDvbnbCf31LXL3YdnOshnqE="; }; sourceRoot = "${src.name}/python"; diff --git a/pkgs/development/python-modules/llama-index-core/default.nix b/pkgs/development/python-modules/llama-index-core/default.nix index 2a47a00a5ac9d..c5043d3d4a052 100644 --- a/pkgs/development/python-modules/llama-index-core/default.nix +++ b/pkgs/development/python-modules/llama-index-core/default.nix @@ -44,7 +44,7 @@ in buildPythonPackage rec { pname = "llama-index-core"; - version = "0.10.35"; + 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-aExejThQPp4rnAiedj/zzgzwIGvLzeARKOTy1VVF1Ys="; + hash = "sha256-yP/60DLg43UOOogxbDvb1p5n8dnfBUjGhcfO5g5g0gA="; }; sourceRoot = "${src.name}/${pname}"; diff --git a/pkgs/development/python-modules/llama-index-llms-openai/default.nix b/pkgs/development/python-modules/llama-index-llms-openai/default.nix index b621d91baed39..d827bde24d0cf 100644 --- a/pkgs/development/python-modules/llama-index-llms-openai/default.nix +++ b/pkgs/development/python-modules/llama-index-llms-openai/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "llama-index-llms-openai"; - version = "0.1.17"; + version = "0.1.18"; pyproject = true; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_llms_openai"; inherit version; - hash = "sha256-ZtOvdh3CMjiLVKAXsMuEAevXTALWnK59YE2CiOwbaD0="; + hash = "sha256-jLdUahiFulWP9YCxFNY4VpoK7YGiZJYRFOcZvEKzcQA="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/loadcredential/default.nix b/pkgs/development/python-modules/loadcredential/default.nix new file mode 100644 index 0000000000000..b0cc59754bb87 --- /dev/null +++ b/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/pkgs/development/python-modules/malduck/default.nix b/pkgs/development/python-modules/malduck/default.nix index 0f15b6a1066cb..204003bdddbc7 100644 --- a/pkgs/development/python-modules/malduck/default.nix +++ b/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/pkgs/development/python-modules/marshmallow-dataclass/default.nix b/pkgs/development/python-modules/marshmallow-dataclass/default.nix index 7b5b2932407a2..4bb06720ca23f 100644 --- a/pkgs/development/python-modules/marshmallow-dataclass/default.nix +++ b/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/pkgs/development/python-modules/marshmallow-enum/default.nix b/pkgs/development/python-modules/marshmallow-enum/default.nix deleted file mode 100644 index fdf2771deebd4..0000000000000 --- a/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/pkgs/development/python-modules/mdtraj/default.nix b/pkgs/development/python-modules/mdtraj/default.nix index 971688348a1d5..a99b36c787659 100644 --- a/pkgs/development/python-modules/mdtraj/default.nix +++ b/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/pkgs/development/python-modules/mechanize/default.nix b/pkgs/development/python-modules/mechanize/default.nix index 3724fa64d06e7..a84fe51da4f2b 100644 --- a/pkgs/development/python-modules/mechanize/default.nix +++ b/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="; - }) - ]; - - nativeBuildInputs = [ - setuptools - ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ - html5lib - ]; + dependencies = [ html5lib ]; - nativeCheckInputs = [ - pytestCheckHook - ]; + nativeCheckInputs = [ pytestCheckHook ]; - pythonImportsCheck = [ - "mechanize" - ]; + pythonImportsCheck = [ "mechanize" ]; disabledTestPaths = [ # Tests require network access diff --git a/pkgs/development/python-modules/meilisearch/default.nix b/pkgs/development/python-modules/meilisearch/default.nix index e5e47b934fd33..4ad70db3281b0 100644 --- a/pkgs/development/python-modules/meilisearch/default.nix +++ b/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/pkgs/development/python-modules/mindsdb-evaluator/default.nix b/pkgs/development/python-modules/mindsdb-evaluator/default.nix index 9cc654911fc5f..311f8761bc44e 100644 --- a/pkgs/development/python-modules/mindsdb-evaluator/default.nix +++ b/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/pkgs/development/python-modules/minidb/default.nix b/pkgs/development/python-modules/minidb/default.nix index 8bd0aea36ca47..20a2eba687d2c 100644 --- a/pkgs/development/python-modules/minidb/default.nix +++ b/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/pkgs/development/python-modules/napari-console/default.nix b/pkgs/development/python-modules/napari-console/default.nix index 9072ada93f420..07b8d735736a1 100644 --- a/pkgs/development/python-modules/napari-console/default.nix +++ b/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/pkgs/development/python-modules/napari/default.nix b/pkgs/development/python-modules/napari/default.nix index 0bccb016570ca..b5baed96a4417 100644 --- a/pkgs/development/python-modules/napari/default.nix +++ b/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/pkgs/development/python-modules/neo/default.nix b/pkgs/development/python-modules/neo/default.nix index d23d2fdc57ed8..d4b5265ba8ed7 100644 --- a/pkgs/development/python-modules/neo/default.nix +++ b/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/pkgs/development/python-modules/ollama/default.nix b/pkgs/development/python-modules/ollama/default.nix index 4d1999a8aae87..299af4e9c9641 100644 --- a/pkgs/development/python-modules/ollama/default.nix +++ b/pkgs/development/python-modules/ollama/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "ollama"; - version = "0.1.9"; + version = "0.2.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "ollama"; repo = "ollama-python"; rev = "refs/tags/v${version}"; - hash = "sha256-ilJgRMzCn/T+6Lr7IuvaCnKhN5cyyEOWuV0N1FtR+Yg="; + hash = "sha256-kfotKUUXBekUd0X32BYAjNWvQJO94bdEDCSrBg2yJRQ="; }; postPatch = '' diff --git a/pkgs/development/python-modules/ome-zarr/default.nix b/pkgs/development/python-modules/ome-zarr/default.nix index 0412a0f807189..b87e8f925931f 100644 --- a/pkgs/development/python-modules/ome-zarr/default.nix +++ b/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/pkgs/development/python-modules/openai/default.nix b/pkgs/development/python-modules/openai/default.nix index edae978c68b00..d29d6deec1293 100644 --- a/pkgs/development/python-modules/openai/default.nix +++ b/pkgs/development/python-modules/openai/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { pname = "openai"; - version = "1.27.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-hBfZC52Ocv2jw2wBGZybvUrPovtK7qZmiI3XWtzO4/o="; + hash = "sha256-zWvrLCAN/OsSiNLQ2jvEh9anoSpMXgEYhAFwh9btWEM="; }; build-system = [ diff --git a/pkgs/development/python-modules/pandas-datareader/default.nix b/pkgs/development/python-modules/pandas-datareader/default.nix index e5222cf7ef83d..de9f285a4a5fd 100644 --- a/pkgs/development/python-modules/pandas-datareader/default.nix +++ b/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/pkgs/development/python-modules/peco/default.nix b/pkgs/development/python-modules/peco/default.nix index 961b0c623d92b..9b2001789cd28 100644 --- a/pkgs/development/python-modules/peco/default.nix +++ b/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/pkgs/development/python-modules/phik/default.nix b/pkgs/development/python-modules/phik/default.nix index b2dae6f29b1ee..bc7dd2a582653 100644 --- a/pkgs/development/python-modules/phik/default.nix +++ b/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 + matplotlib numpy - scipy pandas - matplotlib - numba - pybind11 + 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/pkgs/development/python-modules/pipdeptree/default.nix b/pkgs/development/python-modules/pipdeptree/default.nix index 8dad1316c1a7f..b312b78a2bfb2 100644 --- a/pkgs/development/python-modules/pipdeptree/default.nix +++ b/pkgs/development/python-modules/pipdeptree/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "pipdeptree"; - version = "2.19.1"; + version = "2.20.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "tox-dev"; repo = "pipdeptree"; rev = "refs/tags/${version}"; - hash = "sha256-kXRz78UHQtVyHFFnURSjOOXX8Me2I5tG2bX+u2yGyzY="; + hash = "sha256-Mng5YUM2+T3OFrr4uGVvq5mP0aq10r21pp46tw6lLno="; }; build-system = [ diff --git a/pkgs/development/python-modules/plotnine/default.nix b/pkgs/development/python-modules/plotnine/default.nix index fb86d44472d26..6368f8c667853 100644 --- a/pkgs/development/python-modules/plotnine/default.nix +++ b/pkgs/development/python-modules/plotnine/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "plotnine"; - version = "0.13.5"; + 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-vGxsBcY4CRT4rBUq0AQ4oo0etKK+CtUD487VvnoK/rI="; + 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/pkgs/development/python-modules/private-gpt/default.nix b/pkgs/development/python-modules/private-gpt/default.nix new file mode 100644 index 0000000000000..226489d046cb4 --- /dev/null +++ b/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/pkgs/development/python-modules/pubnub/default.nix b/pkgs/development/python-modules/pubnub/default.nix index 58b6bd159d508..868926ba95f13 100644 --- a/pkgs/development/python-modules/pubnub/default.nix +++ b/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/pkgs/development/python-modules/puremagic/default.nix b/pkgs/development/python-modules/puremagic/default.nix index d9171b6497c65..fc54dbdaa6ec1 100644 --- a/pkgs/development/python-modules/puremagic/default.nix +++ b/pkgs/development/python-modules/puremagic/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "puremagic"; - version = "1.22"; + version = "1.23"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "cdgriffith"; repo = "puremagic"; rev = "refs/tags/${version}"; - hash = "sha256-48gtwH6NXj/n3mm313Im1ey4ZH9TbsSFwjsQuBGuqwA="; + hash = "sha256-DhOTx4Zpux2IiHkw/0nWwWfpnoqxrqqMJw4hrS4ZNGE="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pyannote-core/default.nix b/pkgs/development/python-modules/pyannote-core/default.nix index 453bb0c4d60de..85c01bcee578f 100644 --- a/pkgs/development/python-modules/pyannote-core/default.nix +++ b/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/pkgs/development/python-modules/pyannote-database/default.nix b/pkgs/development/python-modules/pyannote-database/default.nix index e3e3ac56ca703..8cb35b26061da 100644 --- a/pkgs/development/python-modules/pyannote-database/default.nix +++ b/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/pkgs/development/python-modules/pybrowserid/default.nix b/pkgs/development/python-modules/pybrowserid/default.nix index 1a4cd7c43058c..10346ee04cc3d 100644 --- a/pkgs/development/python-modules/pybrowserid/default.nix +++ b/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/pkgs/development/python-modules/pycomm3/default.nix b/pkgs/development/python-modules/pycomm3/default.nix new file mode 100644 index 0000000000000..a6d219110bd09 --- /dev/null +++ b/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/pkgs/development/python-modules/pydeck/default.nix b/pkgs/development/python-modules/pydeck/default.nix index 6edd7a379b3ee..2ea1a86f356a0 100644 --- a/pkgs/development/python-modules/pydeck/default.nix +++ b/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/pkgs/development/python-modules/pyexploitdb/default.nix b/pkgs/development/python-modules/pyexploitdb/default.nix index c59205aa3f1a3..93f5e3567839b 100644 --- a/pkgs/development/python-modules/pyexploitdb/default.nix +++ b/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.16"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { pname = "pyExploitDb"; inherit version; - hash = "sha256-q16YB0lLlw9nXohcT20l41Bv40CqshWzE8nVBBSEppE="; + hash = "sha256-PP9dR8Jl4eWsky3vO9Pgraw0plik/5aWvmOAEc2/Qpo="; }; - 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/pkgs/development/python-modules/pyfxa/default.nix b/pkgs/development/python-modules/pyfxa/default.nix index 39794d592103c..259370299db2e 100644 --- a/pkgs/development/python-modules/pyfxa/default.nix +++ b/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/pkgs/development/python-modules/pyinsteon/default.nix b/pkgs/development/python-modules/pyinsteon/default.nix index 22242ee62bf49..0f52f3dbf45ce 100644 --- a/pkgs/development/python-modules/pyinsteon/default.nix +++ b/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/pkgs/development/python-modules/pynvml/default.nix b/pkgs/development/python-modules/pynvml/default.nix index f73f5bd7d56df..f84a8e0370c4b 100644 --- a/pkgs/development/python-modules/pynvml/default.nix +++ b/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/pkgs/development/python-modules/pyomo/default.nix b/pkgs/development/python-modules/pyomo/default.nix index 35ab0ecec5095..b96dcac4fd35e 100644 --- a/pkgs/development/python-modules/pyomo/default.nix +++ b/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/pkgs/development/python-modules/pyslurm/default.nix b/pkgs/development/python-modules/pyslurm/default.nix index b910da5b69e26..f65aae69cded6 100644 --- a/pkgs/development/python-modules/pyslurm/default.nix +++ b/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/pkgs/development/python-modules/pytest-mypy/default.nix b/pkgs/development/python-modules/pytest-mypy/default.nix index bfe9fb613e24b..84d12cfd825fa 100644 --- a/pkgs/development/python-modules/pytest-mypy/default.nix +++ b/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/pkgs/development/python-modules/python-roborock/default.nix b/pkgs/development/python-modules/python-roborock/default.nix index 49ea2cc277d38..7d746131636e1 100644 --- a/pkgs/development/python-modules/python-roborock/default.nix +++ b/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/pkgs/development/python-modules/python3-gnutls/default.nix b/pkgs/development/python-modules/python3-gnutls/default.nix index 72f695326d758..6adaf3c033933 100644 --- a/pkgs/development/python-modules/python3-gnutls/default.nix +++ b/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/pkgs/development/python-modules/pytrydan/default.nix b/pkgs/development/python-modules/pytrydan/default.nix index 5a191bf800fe7..2a55b834ebb0b 100644 --- a/pkgs/development/python-modules/pytrydan/default.nix +++ b/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.0"; 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-+hFwBFYtRseVwesZtSrL3J/ZnsMAjD2ZAhTlk41hfqU="; }; 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/pkgs/development/python-modules/qdrant-client/default.nix b/pkgs/development/python-modules/qdrant-client/default.nix index 33fdd38d4edb5..0a6a476979c1a 100644 --- a/pkgs/development/python-modules/qdrant-client/default.nix +++ b/pkgs/development/python-modules/qdrant-client/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "qdrant-client"; - version = "1.9.0"; + 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-ka5qhs9yhvbGkxXlq9Z3ZMuY1muf9HaODTxCgSLU4io="; + hash = "sha256-1QYL2othFA/xTgdj549MA1aVDH6jjiuL+aN2Q/supp8="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/resend/default.nix b/pkgs/development/python-modules/resend/default.nix index 5ce129dd67160..a8dca71c52691 100644 --- a/pkgs/development/python-modules/resend/default.nix +++ b/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/pkgs/development/python-modules/rnginline/default.nix b/pkgs/development/python-modules/rnginline/default.nix index acea2482f32cf..7505cfd7346ad 100644 --- a/pkgs/development/python-modules/rnginline/default.nix +++ b/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 - pythonRelaxDepsHook ]; - pythonRelaxDeps = [ - "docopt-ng" + nativeBuildInputs = [ + pythonRelaxDepsHook ]; - 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/pkgs/development/python-modules/rq/default.nix b/pkgs/development/python-modules/rq/default.nix index a0ed2d38b2d86..47a0a7dcfc5e2 100644 --- a/pkgs/development/python-modules/rq/default.nix +++ b/pkgs/development/python-modules/rq/default.nix @@ -47,16 +47,17 @@ 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" diff --git a/pkgs/development/python-modules/safety/default.nix b/pkgs/development/python-modules/safety/default.nix index af7dc8a451103..00cd2758f0bad 100644 --- a/pkgs/development/python-modules/safety/default.nix +++ b/pkgs/development/python-modules/safety/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "safety"; - version = "3.1.0"; + version = "3.2.0"; disabled = pythonOlder "3.7"; @@ -32,7 +32,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-cfR7guzhU+wvJA4nf3y/pw1douDRQxYsZ/Y7L3RZoao="; + hash = "sha256-i9XKtfPYphzg6m6Y8mfBAG0FYJfEXGRP7nr+/31ZScE="; }; postPatch = '' diff --git a/pkgs/development/python-modules/scikit-posthocs/default.nix b/pkgs/development/python-modules/scikit-posthocs/default.nix index e8f3933299a74..1aba1d935c4e9 100644 --- a/pkgs/development/python-modules/scikit-posthocs/default.nix +++ b/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/pkgs/development/python-modules/setuptools-gettext/default.nix b/pkgs/development/python-modules/setuptools-gettext/default.nix index 394f4c4693fad..31440a40e5a34 100644 --- a/pkgs/development/python-modules/setuptools-gettext/default.nix +++ b/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" ]; - pythonImportsCheck = [ - "setuptools_gettext" + nativeCheckInputs = [ + pytestCheckHook + 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/pkgs/development/python-modules/statsmodels/default.nix b/pkgs/development/python-modules/statsmodels/default.nix index e3f40a5cff31f..24dc020859d8d 100644 --- a/pkgs/development/python-modules/statsmodels/default.nix +++ b/pkgs/development/python-modules/statsmodels/default.nix @@ -10,6 +10,7 @@ , scipy , setuptools , setuptools-scm +, stdenv }: buildPythonPackage rec { @@ -57,5 +58,7 @@ buildPythonPackage rec { homepage = "https://www.github.com/statsmodels/statsmodels"; changelog = "https://github.com/statsmodels/statsmodels/releases/tag/v${version}"; license = licenses.bsd3; + # Fails at build time + broken = stdenv.isDarwin; }; } diff --git a/pkgs/development/python-modules/stim/default.nix b/pkgs/development/python-modules/stim/default.nix index 3e95b74ef9ef4..ca76e41880af0 100644 --- a/pkgs/development/python-modules/stim/default.nix +++ b/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/pkgs/development/python-modules/streamz/default.nix b/pkgs/development/python-modules/streamz/default.nix index ff12abf47ae39..87a54da431152 100644 --- a/pkgs/development/python-modules/streamz/default.nix +++ b/pkgs/development/python-modules/streamz/default.nix @@ -1,16 +1,18 @@ -{ stdenv -, lib +{ lib +, stdenv , buildPythonPackage +, pythonOlder +, fetchPypi +, setuptools , confluent-kafka +, dask +, dask-expr , distributed -, fetchpatch -, fetchPypi , 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/pkgs/development/python-modules/succulent/default.nix b/pkgs/development/python-modules/succulent/default.nix index 74d369acefc1b..f3d90ec52abfa 100644 --- a/pkgs/development/python-modules/succulent/default.nix +++ b/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/pkgs/development/python-modules/superqt/default.nix b/pkgs/development/python-modules/superqt/default.nix index e7c3aaa04589a..7012efc0e9065 100644 --- a/pkgs/development/python-modules/superqt/default.nix +++ b/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.5"; + 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="; }; - 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/pkgs/development/python-modules/thriftpy2/default.nix b/pkgs/development/python-modules/thriftpy2/default.nix index e6a696dec9bb8..4a125dd1775bc 100644 --- a/pkgs/development/python-modules/thriftpy2/default.nix +++ b/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 ]; + + nativeBuildInputs = [ cython ]; - propagatedBuildInputs = [ + 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/pkgs/development/python-modules/tinytuya/default.nix b/pkgs/development/python-modules/tinytuya/default.nix new file mode 100644 index 0000000000000..36c15f79825ab --- /dev/null +++ b/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/pkgs/development/python-modules/torch/default.nix b/pkgs/development/python-modules/torch/default.nix index c98b0ac920c5c..d8d3a6532a504 100644 --- a/pkgs/development/python-modules/torch/default.nix +++ b/pkgs/development/python-modules/torch/default.nix @@ -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/pkgs/development/python-modules/total-connect-client/default.nix b/pkgs/development/python-modules/total-connect-client/default.nix index e7b85cf199b60..6770e65194cc2 100644 --- a/pkgs/development/python-modules/total-connect-client/default.nix +++ b/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 = "2024.4"; + 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-LuPyhidbAzt/AU5WuXyxggGxjm9yArHsbn6iAaccMEc="; + hash = "sha256-NGiI4gn59U7NiRYtB6UydxOu+lVtmbl8qF3nbAjiYwk="; }; - build-system = [ - setuptools - ]; + build-system = [ setuptools ]; - dependencies = [ - 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/pkgs/development/python-modules/trafilatura/default.nix b/pkgs/development/python-modules/trafilatura/default.nix index 35212c3434438..a8183bf3f8411 100644 --- a/pkgs/development/python-modules/trafilatura/default.nix +++ b/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'" + ''; + + build-system = [ setuptools ]; - propagatedBuildInputs = [ + 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/pkgs/development/python-modules/type-infer/default.nix b/pkgs/development/python-modules/type-infer/default.nix index b94b06e8a1cba..d9b1b0717f956 100644 --- a/pkgs/development/python-modules/type-infer/default.nix +++ b/pkgs/development/python-modules/type-infer/default.nix @@ -25,7 +25,7 @@ let in buildPythonPackage rec { pname = "type-infer"; - version = "0.0.19"; + version = "0.0.20"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -34,7 +34,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "type_infer"; inherit version; - hash = "sha256-7fWRM776lAyOncp6WZDLH9ouVBhVvV23105xvhw8V24="; + hash = "sha256-F+gfA7ofrbMEE5SrVt9H3s2mZKQLyr6roNUmL4EMJbI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/types-beautifulsoup4/default.nix b/pkgs/development/python-modules/types-beautifulsoup4/default.nix index 24a48b3bdca9b..57c1f550b2e49 100644 --- a/pkgs/development/python-modules/types-beautifulsoup4/default.nix +++ b/pkgs/development/python-modules/types-beautifulsoup4/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "types-beautifulsoup4"; - version = "4.12.0.20240504"; + version = "4.12.0.20240511"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-17evTMxS/CJ4TTOlKWleNDKam91dtqZJybJcssOhSNU="; + hash = "sha256-AE9glv3YOxnNv2yxDk6uV7ECBezMNl0Kadd9qDYBLig="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/types-pyopenssl/default.nix b/pkgs/development/python-modules/types-pyopenssl/default.nix index a00f14c89395e..586e5138aaaca 100644 --- a/pkgs/development/python-modules/types-pyopenssl/default.nix +++ b/pkgs/development/python-modules/types-pyopenssl/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "types-pyopenssl"; - version = "24.0.0.20240417"; + version = "24.1.0.20240425"; format = "setuptools"; src = fetchPypi { pname = "types-pyOpenSSL"; inherit version; - hash = "sha256-OOdfuCjScXvhc3cLuujCKBH97GjivD9YM5VBE+uEI30="; + hash = "sha256-Cn6CYmwZg9yNxZKSvyBlSlHDw4gby7mzN8HabjLwIE4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/uqbar/default.nix b/pkgs/development/python-modules/uqbar/default.nix index 83ccc7fe11fd8..046e3425a7857 100644 --- a/pkgs/development/python-modules/uqbar/default.nix +++ b/pkgs/development/python-modules/uqbar/default.nix @@ -4,8 +4,10 @@ , pytestCheckHook , pythonAtLeast , pythonOlder +, defusedxml , setuptools , sphinx +, typing-extensions , unidecode }: @@ -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/pkgs/development/python-modules/virtualenv-clone/default.nix b/pkgs/development/python-modules/virtualenv-clone/default.nix index 51c1d12b184d8..2ae7abe457db5 100644 --- a/pkgs/development/python-modules/virtualenv-clone/default.nix +++ b/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/pkgs/development/python-modules/weaviate-client/default.nix b/pkgs/development/python-modules/weaviate-client/default.nix index 73f896e5541d5..9047bc8fb1762 100644 --- a/pkgs/development/python-modules/weaviate-client/default.nix +++ b/pkgs/development/python-modules/weaviate-client/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "weaviate-client"; - version = "4.5.7"; + version = "4.6.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "weaviate"; repo = "weaviate-python-client"; rev = "refs/tags/v${version}"; - hash = "sha256-VIGcfAzU/0nrVqhny2Ix6rU0DkDhRvX9UkfK8k412QU="; + hash = "sha256-F4FFG8W8zjEcD1OssioKTik0sy6B/kGITYfW+bqhNkQ="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/wheel-inspect/default.nix b/pkgs/development/python-modules/wheel-inspect/default.nix index bf2ff4ece67b0..30c8b30a095c0 100644 --- a/pkgs/development/python-modules/wheel-inspect/default.nix +++ b/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/pkgs/development/python-modules/wsgitools/default.nix b/pkgs/development/python-modules/wsgitools/default.nix index 948f932271c18..17eb56ec4e2b1 100644 --- a/pkgs/development/python-modules/wsgitools/default.nix +++ b/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/pkgs/development/python-modules/zigpy/default.nix b/pkgs/development/python-modules/zigpy/default.nix index 3cc9a89e70b3f..a52549728bb61 100644 --- a/pkgs/development/python-modules/zigpy/default.nix +++ b/pkgs/development/python-modules/zigpy/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , aiohttp , aioresponses , aiosqlite @@ -74,6 +75,8 @@ buildPythonPackage rec { disabledTests = [ # 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" ]; disabledTestPaths = [ diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index f8d7aeee80af5..8d4004d7580f3 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -335,6 +335,7 @@ let 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 ]; @@ -379,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 ]; @@ -588,12 +590,14 @@ let 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 ]; @@ -1165,6 +1169,11 @@ let patchPhase = "patchShebangs configure"; }); + luajr = old.luajr.overrideAttrs (attrs: { + hardeningDisable = [ "format" ]; + postPatch = "patchShebangs configure"; + }); + RcppArmadillo = old.RcppArmadillo.overrideAttrs (attrs: { patchPhase = "patchShebangs configure"; }); @@ -1199,6 +1208,10 @@ let postPatch = "patchShebangs configure"; }); + instantiate = old.instantiate.overrideAttrs (attrs: { + postPatch = "patchShebangs configure"; + }); + exifr = old.exifr.overrideAttrs (attrs: { postPatch = '' for f in .onLoad .onAttach ; do diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index ab325b7410c5e..14c8ff81ae9d1 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "checkov"; - version = "3.2.88"; + version = "3.2.90"; pyproject = true; src = fetchFromGitHub { owner = "bridgecrewio"; repo = "checkov"; rev = "refs/tags/${version}"; - hash = "sha256-vhYnWDL1rAshXgVDmEW1Ueip3a+yTLo1S8dGTsMXJLo="; + hash = "sha256-I/fSguqs5h4YTP/6whBFYceYd4tC8wrh+PfW8i7+kpY="; }; patches = [ ./flake8-compat-5.x.patch ]; diff --git a/pkgs/development/tools/analysis/stylelint/default.nix b/pkgs/development/tools/analysis/stylelint/default.nix index 26bc3b7893feb..f2c478ea49cf1 100644 --- a/pkgs/development/tools/analysis/stylelint/default.nix +++ b/pkgs/development/tools/analysis/stylelint/default.nix @@ -2,16 +2,16 @@ buildNpmPackage rec { pname = "stylelint"; - version = "16.4.0"; + version = "16.5.0"; src = fetchFromGitHub { owner = "stylelint"; repo = "stylelint"; rev = version; - hash = "sha256-N689OjxUo3KPN3mfNQ1cKYoe8DXcVTNkUO4NuZPGuXI="; + hash = "sha256-kbcf0OPAIeEdh5YI2qqaLJww+ZejfXt/llJTK10nE0M="; }; - npmDepsHash = "sha256-V+hiUMenskHV+ccYysBDD5WoQH9vem+uEfQ5SWEdVFU="; + npmDepsHash = "sha256-tENUngFWjrmsJErvbmFflwGL0uxou0vQjC/MwfCpm+Y="; dontNpmBuild = true; diff --git a/pkgs/development/tools/apko/default.nix b/pkgs/development/tools/apko/default.nix index 6a1ffc9376e26..34cf2c2e3a154 100644 --- a/pkgs/development/tools/apko/default.nix +++ b/pkgs/development/tools/apko/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "apko"; - version = "0.13.2"; + version = "0.14.0"; src = fetchFromGitHub { owner = "chainguard-dev"; repo = pname; rev = "v${version}"; - hash = "sha256-PGRbJ7znsjvh/ATBF8k+pMnRO8wvGY0PAVswVmFaBUc="; + hash = "sha256-e9xWLDs0txl+eiqim3gj7vJRGOFY6MrqOAa1l0TaTbs="; # 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; @@ -24,7 +24,7 @@ buildGoModule rec { find "$out" -name .git -print0 | xargs -0 rm -rf ''; }; - vendorHash = "sha256-aqxXCqhvCGQKI+4FDjbqPNeFvELZviQ7Inwxl65sowk="; + vendorHash = "sha256-FeljCUtHTKni0yU7JwnaeKYJU7pM527drqBgaxWH/cI="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/tools/biome/default.nix b/pkgs/development/tools/biome/default.nix index 2072adf226419..5674846952518 100644 --- a/pkgs/development/tools/biome/default.nix +++ b/pkgs/development/tools/biome/default.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "biome"; - version = "1.6.3"; + version = "1.7.3"; src = fetchFromGitHub { owner = "biomejs"; repo = "biome"; rev = "cli/v${version}"; - hash = "sha256-DooUOp+fr5oOrx04SLlTGro8xc2LieVPNtdvDyTLL/s="; + hash = "sha256-iSL0PRHj32PpKoUogej0bc/zXGpS4ZgZG/+9Pewhl4k="; }; - cargoHash = "sha256-zMMfLDhiqG8Ahe+7PFjpOtwaBXbKkLDIIoHS329/4uQ="; + cargoHash = "sha256-no6ZrH1Ma+n66SLgA3h9dQX8FgeVjFVkxfqR35F/prs="; nativeBuildInputs = [ pkg-config @@ -41,7 +41,7 @@ rustPlatform.buildRustPackage rec { cargoBuildFlags = [ "-p=biome_cli" ]; cargoTestFlags = cargoBuildFlags ++ - # skip a broken test from v1.6.3 release + # skip a broken test from v1.7.3 release # this will be removed on the next version [ "-- --skip=diagnostics::test::termination_diagnostic_size" ]; diff --git a/pkgs/development/tools/coder/default.nix b/pkgs/development/tools/coder/default.nix index 832e73869bd07..df4522faf26ea 100644 --- a/pkgs/development/tools/coder/default.nix +++ b/pkgs/development/tools/coder/default.nix @@ -13,15 +13,6 @@ let channels = { stable = { - version = "2.9.4"; - hash = { - x86_64-linux = "sha256-Sw8wAx69oQFrr24Ukah+GfQvoyn2qX5LljZ398H6QFk="; - x86_64-darwin = "sha256-uSO2gVvyHTf4dWws0QVtfFUdluwJGkwpuYUDIlXwf+I="; - aarch64-linux = "sha256-qI43x2hL9X4GsG511PrEZN5MtRV8th1NRbtkbZ2gZ3A="; - aarch64-darwin = "sha256-KbUH2OeDqEXoRMx6kmMbe0tEcE3FLuSMkRoFFnfXLfE="; - }; - }; - mainline = { version = "2.10.2"; hash = { x86_64-linux = "sha256-U3qHEjIKq8JkpDp6TehMs6t5L3GpSGt4D10XSAQ9Ii0="; @@ -30,6 +21,15 @@ let aarch64-darwin = "sha256-3sHmR6PTRlBSIdD4rja4y8v0gOY4cbbyhW7qssgpqp8="; }; }; + mainline = { + version = "2.11.0"; + hash = { + x86_64-linux = "sha256-aJwL4WCJXxSBrfaUHEECQqedz2lKBOa8sdRItSBpxp4="; + x86_64-darwin = "sha256-4D4MoDrEJtawFeUBG9BiJ6HZ9uqx9uQDIHHNB7m2pp8="; + aarch64-linux = "sha256-2UlCxykSfnK50OPb61YC42MTTlPL1njf0vpwmqaUbI8="; + aarch64-darwin = "sha256-mh0Lr+SH4jZTx1xH7QoqfSLDma5nS61sv31QuOYAgQk="; + }; + }; }; in stdenvNoCC.mkDerivation (finalAttrs: { diff --git a/pkgs/development/tools/continuous-integration/drone/default.nix b/pkgs/development/tools/continuous-integration/drone/default.nix index e6f6b8bf4c45c..26d98065c8207 100644 --- a/pkgs/development/tools/continuous-integration/drone/default.nix +++ b/pkgs/development/tools/continuous-integration/drone/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "drone.io${lib.optionalString (!enableUnfree) "-oss"}"; - version = "2.23.0"; + version = "2.24.0"; src = fetchFromGitHub { owner = "harness"; repo = "drone"; rev = "v${version}"; - sha256 = "sha256-HkyR2h7dgbEhqexJXyGebP3zkoTLlzuY+1O2pidAveQ="; + sha256 = "sha256-IiSsw0bZDAVuOrm7JBTT14Cf7I/koeS2Yw6vWYBG7kA="; }; vendorHash = "sha256-n4KbKkqAnHDIsXs8A/FE+rCkSKQKr5fv7npJ/X6t0mk="; diff --git a/pkgs/development/tools/continuous-integration/gitea-actions-runner/default.nix b/pkgs/development/tools/continuous-integration/gitea-actions-runner/default.nix index 68093f39e4f86..a2ed89e2ca760 100644 --- a/pkgs/development/tools/continuous-integration/gitea-actions-runner/default.nix +++ b/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/pkgs/development/tools/database/atlas/default.nix b/pkgs/development/tools/database/atlas/default.nix index 270d134927855..8fc770f92cd75 100644 --- a/pkgs/development/tools/database/atlas/default.nix +++ b/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 ]; diff --git a/pkgs/development/tools/devpi-client/default.nix b/pkgs/development/tools/devpi-client/default.nix index 66d84e5a3b127..ea60c216a8f55 100644 --- a/pkgs/development/tools/devpi-client/default.nix +++ b/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/pkgs/development/tools/ent/default.nix b/pkgs/development/tools/ent/default.nix index a1357c8ab2d3a..58482135068c2 100644 --- a/pkgs/development/tools/ent/default.nix +++ b/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/pkgs/development/tools/faas-cli/default.nix b/pkgs/development/tools/faas-cli/default.nix index 2149eb50c2786..da0151b8486ed 100644 --- a/pkgs/development/tools/faas-cli/default.nix +++ b/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/pkgs/development/tools/git-ps-rs/default.nix b/pkgs/development/tools/git-ps-rs/default.nix index 6d4a5be75418e..b9e41327237bd 100644 --- a/pkgs/development/tools/git-ps-rs/default.nix +++ b/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/pkgs/development/tools/language-servers/helm-ls/default.nix b/pkgs/development/tools/language-servers/helm-ls/default.nix index 337e45153f551..587a209562ab3 100644 --- a/pkgs/development/tools/language-servers/helm-ls/default.nix +++ b/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/pkgs/development/tools/misc/astyle/default.nix b/pkgs/development/tools/misc/astyle/default.nix index f7c7a1f09cdb0..a23e7936985c4 100644 --- a/pkgs/development/tools/misc/astyle/default.nix +++ b/pkgs/development/tools/misc/astyle/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "astyle"; - version = "3.4.14"; + version = "3.4.15"; src = fetchurl { url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2"; - hash = "sha256-YGqD85FGczGF9nYwWdKSQzxA85Prb1IELhY/jfThaj4="; + hash = "sha256-BQTHM7v+lmiLZsEHtt8/oFJj3vq7I4WOQsRLpVRYbms="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/tools/profiling/pprof/default.nix b/pkgs/development/tools/profiling/pprof/default.nix index e81446d7f12e4..eba53210aa3e7 100644 --- a/pkgs/development/tools/profiling/pprof/default.nix +++ b/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/pkgs/development/tools/reindeer/default.nix b/pkgs/development/tools/reindeer/default.nix index 8b6925e860e25..27e51f1c97541 100644 --- a/pkgs/development/tools/reindeer/default.nix +++ b/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/pkgs/development/tools/sentry-cli/default.nix b/pkgs/development/tools/sentry-cli/default.nix index 324218082bc3d..e291ed8eab377 100644 --- a/pkgs/development/tools/sentry-cli/default.nix +++ b/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 \ diff --git a/pkgs/development/tools/trunk/default.nix b/pkgs/development/tools/trunk/default.nix index 55292d9d89fae..c4ec27393a486 100644 --- a/pkgs/development/tools/trunk/default.nix +++ b/pkgs/development/tools/trunk/default.nix @@ -12,13 +12,13 @@ SystemConfiguration rustPlatform.buildRustPackage rec { pname = "trunk"; - version = "0.20.0"; + version = "0.20.1"; src = fetchFromGitHub { owner = "trunk-rs"; repo = "trunk"; rev = "v${version}"; - hash = "sha256-iUW2tltF8RGyd84rN60Wv2NFgHS/x3cEFeD+YhMizhY="; + hash = "sha256-VcTlXGfNfkbFoJiNmOp0AS0/NApgTaiZEafZSV2PuTI="; }; nativeBuildInputs = [ pkg-config ]; @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { # requires network checkFlags = [ "--skip=tools::tests::download_and_install_binaries" ]; - cargoHash = "sha256-fUURwuOwuI9ED08AwrVLhQtltwczyX4Q2M4rZlNEAHU="; + cargoHash = "sha256-jXp6B9eTYKfDgzzgp1oRMzwVJOzsh9h0+igQLBZmdsk="; meta = with lib; { homepage = "https://github.com/trunk-rs/trunk"; diff --git a/pkgs/development/tools/yamlfmt/default.nix b/pkgs/development/tools/yamlfmt/default.nix index 1b7b34c70bd0e..3b7fbc20ca389 100644 --- a/pkgs/development/tools/yamlfmt/default.nix +++ b/pkgs/development/tools/yamlfmt/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "yamlfmt"; - version = "0.12.0"; + version = "0.12.1"; src = fetchFromGitHub { owner = "google"; repo = pname; rev = "v${version}"; - sha256 = "sha256-hT5+7WaFl19iIdXWFPD82BE9z/2wzHKJJvVE4ZpZwsk="; + sha256 = "sha256-VAXDkD4JLoiTomCNtuex/ZEAZtWDEEg5cxETYemvQW8="; }; vendorHash = "sha256-UfULQw7wAEJjTFp6+ACF5Ki04eFKeUEgmbt1c8pUolA="; diff --git a/pkgs/development/tools/yq-go/default.nix b/pkgs/development/tools/yq-go/default.nix index f4d8137c33eba..f54f77113e42e 100644 --- a/pkgs/development/tools/yq-go/default.nix +++ b/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/pkgs/development/web/flyctl/default.nix b/pkgs/development/web/flyctl/default.nix index 1b5e2d6f0770d..8ca6eca5268b1 100644 --- a/pkgs/development/web/flyctl/default.nix +++ b/pkgs/development/web/flyctl/default.nix @@ -2,13 +2,13 @@ buildGo122Module rec { pname = "flyctl"; - version = "0.2.51"; + version = "0.2.52"; src = fetchFromGitHub { owner = "superfly"; repo = "flyctl"; rev = "v${version}"; - hash = "sha256-UAA8aTT4Q3aimXJTz3P7Hirx4I3UZJb5KdXT59hxeXs="; + hash = "sha256-BCnMXyS94tuD+Un1DLqs3mdGi7XrVBoZGJ/XkpACOQI"; }; vendorHash = "sha256-eTiY65VGFBgGzCOrnp/WbOo9Lbdk4PYwT7CppjsZ4WE="; diff --git a/pkgs/games/nile/default.nix b/pkgs/games/nile/default.nix index 18d1d3c28ae5a..928ba0743d04b 100644 --- a/pkgs/games/nile/default.nix +++ b/pkgs/games/nile/default.nix @@ -15,14 +15,14 @@ buildPythonApplication rec { pname = "nile"; - version = "1.0.2-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"; diff --git a/pkgs/games/xskat/default.nix b/pkgs/games/xskat/default.nix index 6f28a6846ea75..993070c89c96c 100644 --- a/pkgs/games/xskat/default.nix +++ b/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/pkgs/kde/frameworks/kfilemetadata/default.nix b/pkgs/kde/frameworks/kfilemetadata/default.nix index b6b5f3a7bfbd5..0e9fd5489e7e1 100644 --- a/pkgs/kde/frameworks/kfilemetadata/default.nix +++ b/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/pkgs/kde/frameworks/kguiaddons/default.nix b/pkgs/kde/frameworks/kguiaddons/default.nix index 3c1fb8034a0a4..3aa8bcdf29f5a 100644 --- a/pkgs/kde/frameworks/kguiaddons/default.nix +++ b/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/pkgs/kde/frameworks/kidletime/default.nix b/pkgs/kde/frameworks/kidletime/default.nix index 8fd68f04ec14d..7171822ec1da4 100644 --- a/pkgs/kde/frameworks/kidletime/default.nix +++ b/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/pkgs/kde/frameworks/kwindowsystem/default.nix b/pkgs/kde/frameworks/kwindowsystem/default.nix index 711638cb106c2..a5fb8eddb7eab 100644 --- a/pkgs/kde/frameworks/kwindowsystem/default.nix +++ b/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/pkgs/kde/frameworks/qqc2-desktop-style/default.nix b/pkgs/kde/frameworks/qqc2-desktop-style/default.nix index d681efd14f415..3c756d9b93530 100644 --- a/pkgs/kde/frameworks/qqc2-desktop-style/default.nix +++ b/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/pkgs/kde/frameworks/solid/default.nix b/pkgs/kde/frameworks/solid/default.nix index d59d15f16ead3..2c628b8dbc3ed 100644 --- a/pkgs/kde/frameworks/solid/default.nix +++ b/pkgs/kde/frameworks/solid/default.nix @@ -1,6 +1,5 @@ { mkKdeDerivation, - fetchpatch, qttools, bison, flex, @@ -12,13 +11,6 @@ mkKdeDerivation { patches = [ # Also search /run/wrappers for mount/umount ./fix-search-path.patch - - # Backport fix for mounting removable LUKS devices - # FIXME: remove in 6.2 - (fetchpatch { - url = "https://invent.kde.org/frameworks/solid/-/commit/a3b18591ba144fae0cd0cfc087a45c64000d4e51.patch"; - hash = "sha256-e7+amjOShUSzPb0pAxnAuuh/fbK/YLESqR0co1bs+wg="; - }) ]; extraNativeBuildInputs = [qttools bison flex]; diff --git a/pkgs/kde/gear/akonadi-search/default.nix b/pkgs/kde/gear/akonadi-search/default.nix index 6e89f0b685ff7..416dd91a9ee5b 100644 --- a/pkgs/kde/gear/akonadi-search/default.nix +++ b/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/pkgs/kde/gear/angelfish/default.nix b/pkgs/kde/gear/angelfish/default.nix index 2250b5db6a43b..0d9b4a341f05d 100644 --- a/pkgs/kde/gear/angelfish/default.nix +++ b/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/pkgs/kde/gear/arianna/default.nix b/pkgs/kde/gear/arianna/default.nix index 9e56cfda9efe7..247da11b6d3dd 100644 --- a/pkgs/kde/gear/arianna/default.nix +++ b/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/pkgs/kde/gear/ghostwriter/default.nix b/pkgs/kde/gear/ghostwriter/default.nix index f4b4a3cee21e3..273e805549e74 100644 --- a/pkgs/kde/gear/ghostwriter/default.nix +++ b/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/pkgs/kde/gear/gwenview/default.nix b/pkgs/kde/gear/gwenview/default.nix index 2788e592ef3e2..4bbb5f98eb1e8 100644 --- a/pkgs/kde/gear/gwenview/default.nix +++ b/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/pkgs/kde/gear/kasts/default.nix b/pkgs/kde/gear/kasts/default.nix index 860af4a1f0817..2375bb00af21f 100644 --- a/pkgs/kde/gear/kasts/default.nix +++ b/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/pkgs/kde/gear/kcalc/default.nix b/pkgs/kde/gear/kcalc/default.nix index fdc55b3532782..28f1d314ce964 100644 --- a/pkgs/kde/gear/kcalc/default.nix +++ b/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/pkgs/kde/gear/kdepim-addons/default.nix b/pkgs/kde/gear/kdepim-addons/default.nix index e256ee8fdf1dc..fded9e9b02058 100644 --- a/pkgs/kde/gear/kdepim-addons/default.nix +++ b/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/pkgs/kde/gear/kio-extras/default.nix b/pkgs/kde/gear/kio-extras/default.nix index b80f9175a5e9b..18cf462941373 100644 --- a/pkgs/kde/gear/kio-extras/default.nix +++ b/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/pkgs/kde/gear/koko/default.nix b/pkgs/kde/gear/koko/default.nix index faec24560b6c6..1241f68e12a74 100644 --- a/pkgs/kde/gear/koko/default.nix +++ b/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/pkgs/kde/gear/kopeninghours/default.nix b/pkgs/kde/gear/kopeninghours/default.nix index b315d765fb396..7ba5214ac09fb 100644 --- a/pkgs/kde/gear/kopeninghours/default.nix +++ b/pkgs/kde/gear/kopeninghours/default.nix @@ -16,5 +16,6 @@ mkKdeDerivation { enablePython = true; python = python3; }) + python3 ]; } diff --git a/pkgs/kde/gear/plasmatube/default.nix b/pkgs/kde/gear/plasmatube/default.nix index 05285f6b6c1d6..63236fe00d76f 100644 --- a/pkgs/kde/gear/plasmatube/default.nix +++ b/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/pkgs/kde/gear/sweeper/default.nix b/pkgs/kde/gear/sweeper/default.nix index e2b7fd934436e..24e75b7c5301e 100644 --- a/pkgs/kde/gear/sweeper/default.nix +++ b/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/pkgs/kde/gear/tokodon/default.nix b/pkgs/kde/gear/tokodon/default.nix index 1e12163eb98bd..fd47144eda1d1 100644 --- a/pkgs/kde/gear/tokodon/default.nix +++ b/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/pkgs/kde/generated/dependencies.json b/pkgs/kde/generated/dependencies.json index aed3f12814529..70f5499bfdbc0 100644 --- a/pkgs/kde/generated/dependencies.json +++ b/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/pkgs/kde/generated/projects.json b/pkgs/kde/generated/projects.json index 8986f2db0823f..d798654c27d8e 100644 --- a/pkgs/kde/generated/projects.json +++ b/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/pkgs/kde/generated/sources/frameworks.json b/pkgs/kde/generated/sources/frameworks.json index a2b93aa050548..3096bec16988b 100644 --- a/pkgs/kde/generated/sources/frameworks.json +++ b/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.0", + "url": "mirror://kde/stable/frameworks/6.2/kirigami-6.2.0.tar.xz", + "hash": "sha256-VyRbUY1kxGr6tCoaYZYJr7YOVGAzoWK3GMdSuINQtAw=" }, "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/pkgs/kde/lib/mk-kde-derivation.nix b/pkgs/kde/lib/mk-kde-derivation.nix index 975d2e4af93ab..2a983782a4170 100644 --- a/pkgs/kde/lib/mk-kde-derivation.nix +++ b/pkgs/kde/lib/mk-kde-derivation.nix @@ -88,6 +88,20 @@ 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; @@ -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/pkgs/kde/misc/kirigami-addons/default.nix b/pkgs/kde/misc/kirigami-addons/default.nix index 90106d588fede..187a5aebe2ba4 100644 --- a/pkgs/kde/misc/kirigami-addons/default.nix +++ b/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/pkgs/kde/misc/mpvqt/default.nix b/pkgs/kde/misc/mpvqt/default.nix index fc237f97a803a..84d78e26bc000 100644 --- a/pkgs/kde/misc/mpvqt/default.nix +++ b/pkgs/kde/misc/mpvqt/default.nix @@ -2,7 +2,7 @@ lib, mkKdeDerivation, fetchFromGitLab, - mpv, + mpv-unwrapped, qtdeclarative, }: mkKdeDerivation rec { @@ -18,7 +18,7 @@ mkKdeDerivation rec { }; extraBuildInputs = [qtdeclarative]; - extraPropagatedBuildInputs = [mpv]; + extraPropagatedBuildInputs = [mpv-unwrapped]; meta.license = with lib.licenses; [bsd2 bsd3 cc-by-sa-40 cc0 lgpl21Only lgpl3Only lgpl3Plus mit]; } diff --git a/pkgs/kde/plasma/kwayland/default.nix b/pkgs/kde/plasma/kwayland/default.nix index 341fd8d356082..86713b834bec7 100644 --- a/pkgs/kde/plasma/kwayland/default.nix +++ b/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/pkgs/kde/plasma/layer-shell-qt/default.nix b/pkgs/kde/plasma/layer-shell-qt/default.nix index 9783220cddf2d..dd7290379c5f2 100644 --- a/pkgs/kde/plasma/layer-shell-qt/default.nix +++ b/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/pkgs/kde/plasma/xdg-desktop-portal-kde/default.nix b/pkgs/kde/plasma/xdg-desktop-portal-kde/default.nix index 9d5be65fe097b..7563e934e502f 100644 --- a/pkgs/kde/plasma/xdg-desktop-portal-kde/default.nix +++ b/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/pkgs/os-specific/bsd/freebsd/default.nix b/pkgs/os-specific/bsd/freebsd/default.nix index 4295dc213af9d..c605d9f709374 100644 --- a/pkgs/os-specific/bsd/freebsd/default.nix +++ b/pkgs/os-specific/bsd/freebsd/default.nix @@ -5,7 +5,7 @@ callPackage, crossLibcStdenv, attributePathToSplice ? [ "freebsd" ], - branch ? "release/13.1.0", + branch ? "release/14.0.0", }: let diff --git a/pkgs/os-specific/bsd/freebsd/package-set.nix b/pkgs/os-specific/bsd/freebsd/package-set.nix index 000377c6af91e..dfde4a0a31fa2 100644 --- a/pkgs/os-specific/bsd/freebsd/package-set.nix +++ b/pkgs/os-specific/bsd/freebsd/package-set.nix @@ -17,6 +17,7 @@ lib.packagesFromDirectoryRecursive { } // { inherit sourceData patchesRoot versionData; + patches = ./patches/${self.versionData.revision}; # Keep the crawled portion of Nixpkgs finite. buildFreebsd = lib.dontRecurseIntoAttrs buildFreebsd; @@ -26,7 +27,8 @@ lib.packagesFromDirectoryRecursive { sha256 = "BpHqJfnGOeTE7tkFJBx0Wk8ryalmf4KNTit/Coh026E="; }; - compatIfNeeded = lib.optional (!stdenvNoCC.hostPlatform.isFreeBSD) self.compat; + compatIsNeeded = !stdenvNoCC.hostPlatform.isFreeBSD; + compatIfNeeded = lib.optional self.compatIsNeeded self.compat; freebsd-lib = import ./lib { version = lib.concatStringsSep "." ( map toString ( @@ -44,7 +46,7 @@ lib.packagesFromDirectoryRecursive { compat = self.callPackage ./pkgs/compat/package.nix { inherit stdenv; - inherit (buildFreebsd) makeMinimal boot-install; + inherit (buildFreebsd) makeMinimal; }; csu = self.callPackage ./pkgs/csu.nix { @@ -52,13 +54,11 @@ lib.packagesFromDirectoryRecursive { inherit (self) include; }; - include = self.callPackage ./pkgs/include/package.nix { - inherit (buildFreebsd) makeMinimal install rpcgen; - }; + include = self.callPackage ./pkgs/include/package.nix { inherit (buildFreebsd) rpcgen mtree; }; install = self.callPackage ./pkgs/install.nix { inherit (buildFreebsd) makeMinimal; - inherit (self) mtree libnetbsd; + inherit (self) libmd libnetbsd; }; libc = self.callPackage ./pkgs/libc/package.nix { @@ -67,16 +67,30 @@ lib.packagesFromDirectoryRecursive { 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) makeMinimal install tsort; + 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/pkgs/os-specific/bsd/freebsd/patches/13.1/mtree-Makefile.patch b/pkgs/os-specific/bsd/freebsd/patches/13.1/mtree-Makefile.patch new file mode 100644 index 0000000000000..2a6e560d1d287 --- /dev/null +++ b/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/pkgs/os-specific/bsd/freebsd/patches/14.0/bmake-no-compiler-rt.patch b/pkgs/os-specific/bsd/freebsd/patches/14.0/bmake-no-compiler-rt.patch new file mode 100644 index 0000000000000..f43d87c01e549 --- /dev/null +++ b/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/pkgs/os-specific/bsd/freebsd/patches/14.0/compat-fix-typedefs-locations.patch b/pkgs/os-specific/bsd/freebsd/patches/14.0/compat-fix-typedefs-locations.patch new file mode 100644 index 0000000000000..3336a2504e584 --- /dev/null +++ b/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 <sys/sysmacros.h> + #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 <sys/types.h> + ++#include <sys/_types.h> ++ + #ifndef __size_t + typedef __SIZE_TYPE__ __size_t; + #endif diff --git a/pkgs/os-specific/bsd/freebsd/patches/14.0/compat-install-dirs.patch b/pkgs/os-specific/bsd/freebsd/patches/14.0/compat-install-dirs.patch new file mode 100644 index 0000000000000..4bc21cf8eb147 --- /dev/null +++ b/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/pkgs/os-specific/bsd/freebsd/patches/14.0/install-bootstrap-Makefile.patch b/pkgs/os-specific/bsd/freebsd/patches/14.0/install-bootstrap-Makefile.patch new file mode 100644 index 0000000000000..a69c5501ddd16 --- /dev/null +++ b/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/pkgs/os-specific/bsd/freebsd/patches/14.0/libc-msun-arch-subdir.patch b/pkgs/os-specific/bsd/freebsd/patches/14.0/libc-msun-arch-subdir.patch new file mode 100644 index 0000000000000..4a69e85a986a0 --- /dev/null +++ b/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/pkgs/os-specific/bsd/freebsd/patches/14.0/libc-no-force--lcompiler-rt.patch b/pkgs/os-specific/bsd/freebsd/patches/14.0/libc-no-force--lcompiler-rt.patch new file mode 100644 index 0000000000000..60176fb73cf76 --- /dev/null +++ b/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/pkgs/os-specific/bsd/freebsd/patches/14.0/libnetbsd-do-install.patch b/pkgs/os-specific/bsd/freebsd/patches/14.0/libnetbsd-do-install.patch new file mode 100644 index 0000000000000..a7bd032d2be54 --- /dev/null +++ b/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 <bsd.lib.mk> diff --git a/pkgs/os-specific/bsd/freebsd/patches/14.0/librpcsvc-include-subdir.patch b/pkgs/os-specific/bsd/freebsd/patches/14.0/librpcsvc-include-subdir.patch new file mode 100644 index 0000000000000..38e06682869fb --- /dev/null +++ b/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/pkgs/os-specific/bsd/freebsd/patches/14.0/mtree-Makefile.patch b/pkgs/os-specific/bsd/freebsd/patches/14.0/mtree-Makefile.patch new file mode 100644 index 0000000000000..2a6e560d1d287 --- /dev/null +++ b/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/pkgs/os-specific/bsd/freebsd/patches/14.0/no-perms-BSD.include.dist.patch b/pkgs/os-specific/bsd/freebsd/patches/14.0/no-perms-BSD.include.dist.patch new file mode 100644 index 0000000000000..985617ee0f457 --- /dev/null +++ b/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/pkgs/os-specific/bsd/freebsd/patches/14.0/rtld-no-force--lcompiler-rt.patch b/pkgs/os-specific/bsd/freebsd/patches/14.0/rtld-no-force--lcompiler-rt.patch new file mode 100644 index 0000000000000..45f0d0c51eec0 --- /dev/null +++ b/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 <bsd.prog.mk> + ${PROG_FULL}: ${VERSION_MAP} diff --git a/pkgs/os-specific/bsd/freebsd/patches/14.0/sys-gnu-date.patch b/pkgs/os-specific/bsd/freebsd/patches/14.0/sys-gnu-date.patch new file mode 100644 index 0000000000000..2356446baf853 --- /dev/null +++ b/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/pkgs/os-specific/bsd/freebsd/patches/14.0/sys-no-explicit-intrinsics-dep.patch b/pkgs/os-specific/bsd/freebsd/patches/14.0/sys-no-explicit-intrinsics-dep.patch new file mode 100644 index 0000000000000..5cf926d4519b2 --- /dev/null +++ b/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 <bsd.kmod.mk> + +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/pkgs/os-specific/bsd/freebsd/pkgs/compat/package.nix b/pkgs/os-specific/bsd/freebsd/pkgs/compat/package.nix index be3a7a9104745..f597d6e3705b4 100644 --- a/pkgs/os-specific/bsd/freebsd/pkgs/compat/package.nix +++ b/pkgs/os-specific/bsd/freebsd/pkgs/compat/package.nix @@ -2,7 +2,7 @@ lib, stdenv, mkDerivation, - patchesRoot, + versionData, bsdSetupHook, freebsdSetupHook, makeMinimal, @@ -17,7 +17,7 @@ let inherit (freebsd-lib) mkBsdArch; in -mkDerivation rec { +mkDerivation { pname = "compat"; path = "tools/build"; extraPaths = @@ -40,6 +40,9 @@ mkDerivation rec { # Take only individual headers, or else we will clobber native libc, etc. "sys/rpc/types.h" + ] + ++ lib.optionals (versionData.major == 14) [ "sys/sys/bitcount.h" ] + ++ [ # Listed in Makekfile as INC "include/mpool.h" @@ -53,6 +56,13 @@ mkDerivation rec { "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 @@ -80,6 +90,12 @@ mkDerivation rec { "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" @@ -92,12 +108,11 @@ mkDerivation rec { "lib/libcapsicum" "lib/libcasper" - ]; + "lib/libmd" - patches = [ - /${patchesRoot}/compat-install-dirs.patch - /${patchesRoot}/compat-fix-typedefs-locations.patch - ]; + # idk bro + "sys/sys/kbio.h" + ]; preBuild = '' @@ -151,4 +166,9 @@ mkDerivation rec { + 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/pkgs/os-specific/bsd/freebsd/pkgs/csu.nix b/pkgs/os-specific/bsd/freebsd/pkgs/csu.nix index fd62338d7f9f0..0f74d78b1d13d 100644 --- a/pkgs/os-specific/bsd/freebsd/pkgs/csu.nix +++ b/pkgs/os-specific/bsd/freebsd/pkgs/csu.nix @@ -12,6 +12,7 @@ }: mkDerivation { + isStatic = true; path = "lib/csu"; extraPaths = [ "lib/Makefile.inc" diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/ctfconvert.nix b/pkgs/os-specific/bsd/freebsd/pkgs/ctfconvert.nix index a85836e58b8de..9e653bb4f51ef 100644 --- a/pkgs/os-specific/bsd/freebsd/pkgs/ctfconvert.nix +++ b/pkgs/os-specific/bsd/freebsd/pkgs/ctfconvert.nix @@ -1,15 +1,7 @@ { lib, - stdenv, mkDerivation, - bsdSetupHook, - freebsdSetupHook, - makeMinimal, - install, - mandoc, - groff, compatIfNeeded, - libelf, libdwarf, zlib, libspl, @@ -26,21 +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 ]; + meta.license = lib.licenses.cddl; } diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/filterSource.nix b/pkgs/os-specific/bsd/freebsd/pkgs/filterSource.nix new file mode 100644 index 0000000000000..dc215c18aecb7 --- /dev/null +++ b/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/pkgs/os-specific/bsd/freebsd/pkgs/freebsdSetupHook/setup-hook.sh b/pkgs/os-specific/bsd/freebsd/pkgs/freebsdSetupHook/setup-hook.sh index 929782954ba77..96a3d14c80f7b 100644 --- a/pkgs/os-specific/bsd/freebsd/pkgs/freebsdSetupHook/setup-hook.sh +++ b/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/pkgs/os-specific/bsd/freebsd/pkgs/include/package.nix b/pkgs/os-specific/bsd/freebsd/pkgs/include/package.nix index fd17dcbb99e0b..70734226a54f5 100644 --- a/pkgs/os-specific/bsd/freebsd/pkgs/include/package.nix +++ b/pkgs/os-specific/bsd/freebsd/pkgs/include/package.nix @@ -1,19 +1,13 @@ { lib, mkDerivation, - patchesRoot, buildPackages, - bsdSetupHook, - freebsdSetupHook, - makeMinimal, - install, - mandoc, - groff, - rsync, # , nbperf rpcgen, + mtree, }: mkDerivation { + isStatic = true; path = "include"; extraPaths = [ @@ -22,22 +16,11 @@ mkDerivation { "sys" ]; - nativeBuildInputs = [ - bsdSetupHook - freebsdSetupHook - makeMinimal - install - mandoc - groff - rsync # nbperf + extraNativeBuildInputs = [ rpcgen - - # HACK use NetBSD's for now - buildPackages.netbsd.mtree + mtree ]; - patches = [ /${patchesRoot}/no-perms-BSD.include.dist.patch ]; - # The makefiles define INCSDIR per subdirectory, so we have to set # something else on the command line so those definitions aren't # overridden. @@ -46,6 +29,7 @@ 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" ]; diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/install.nix b/pkgs/os-specific/bsd/freebsd/pkgs/install.nix index 0f70087618df0..b8e59adb09c5f 100644 --- a/pkgs/os-specific/bsd/freebsd/pkgs/install.nix +++ b/pkgs/os-specific/bsd/freebsd/pkgs/install.nix @@ -4,7 +4,6 @@ mkDerivation, writeShellScript, freebsd-lib, - mtree, bsdSetupHook, freebsdSetupHook, makeMinimal, @@ -30,7 +29,7 @@ let in mkDerivation { path = "usr.bin/xinstall"; - extraPaths = [ mtree.path ]; + extraPaths = [ "contrib/mtree" ]; nativeBuildInputs = [ bsdSetupHook freebsdSetupHook @@ -44,13 +43,18 @@ mkDerivation { 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"; + 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 diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/libc/package.nix b/pkgs/os-specific/bsd/freebsd/pkgs/libc/package.nix index 6cf2216ba05f4..8f2cc976463e4 100644 --- a/pkgs/os-specific/bsd/freebsd/pkgs/libc/package.nix +++ b/pkgs/os-specific/bsd/freebsd/pkgs/libc/package.nix @@ -1,8 +1,8 @@ { lib, + buildPackages, stdenv, mkDerivation, - patchesRoot, bsdSetupHook, freebsdSetupHook, @@ -12,62 +12,108 @@ byacc, gencat, rpcgen, + mkcsmapper, + mkesdb, 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" - - # libthr - "lib/libthr" - "lib/libthread_db" - "libexec/rtld-elf" - - # librpcsvc - "lib/librpcsvc" - - # librt - "lib/librt" - - # libcrypt - "lib/libcrypt" - "lib/libmd" - "sys/crypto/sha2" - ]; + 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" ] + ++ [ - patches = [ - # Hack around broken propogating MAKEFLAGS to submake, just inline logic - /${patchesRoot}/libc-msun-arch-subdir.patch + # libthr + "lib/libthr" + "lib/libthread_db" + "libexec/rtld-elf" + "lib/csu/common/crtbrand.S" + "lib/csu/common/notes.h" - # Don't force -lcompiler-rt, we don't actually call it that - /${patchesRoot}/libc-no-force--lcompiler-rt.patch + # librpcsvc + "lib/librpcsvc" - # Fix extra include dir to get rpcsvc headers. - /${patchesRoot}/librpcsvc-include-subdir.patch - ]; + # librt + "lib/librt" + + # libcrypt + "lib/libcrypt" + "lib/libmd" + "sys/crypto/sha2" + "sys/crypto/skein" + + # 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" + + # terminfo + "lib/ncurses" + "contrib/ncurses" + "lib/Makefile.inc" + ] + ++ lib.optionals (stdenv.hostPlatform.isx86_32) [ "lib/libssp_nonshared" ] + ++ [ + "lib/libexecinfo" + "contrib/libexecinfo" + + "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 <src.opts.mk>' "" + + substituteInPlace $BSDSRCDIR/include/paths.h \ + --replace '/usr/lib/i18n' '${builtins.placeholder "out"}/lib/i18n' \ + --replace '/usr/share/i18n' '${builtins.placeholder "out"}/share/i18n' ''; nativeBuildInputs = [ @@ -80,16 +126,20 @@ mkDerivation rec { byacc gencat rpcgen + mkcsmapper + mkesdb ]; 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"; + 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\"" + ]; makeFlags = [ "STRIP=-s" # flag to install, not command @@ -100,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"; @@ -112,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"; + + NO_FSCHG = "yes"; + + preBuild = lib.optionalString (stdenv.hostPlatform.isx86_32) '' + make -C $BSDSRCDIR/lib/libssp_nonshared $makeFlags + make -C $BSDSRCDIR/lib/libssp_nonshared $makeFlags install + ''; - postInstall = '' - pushd ${include} - find . -type d -exec mkdir -p $out/\{} \; - find . \( -type f -o -type l \) -exec cp -pr \{} $out/\{} \; - popd + postInstall = + '' + pushd ${include} + 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 + pushd ${csu} + find . -type d -exec mkdir -p $out/\{} \; + find . \( -type f -o -type l \) -exec cp -pr \{} $out/\{} \; + popd - sed -i -e 's| [^ ]*/libc_nonshared.a||' $out/lib/libc.so + mkdir $BSDSRCDIR/lib/libcompiler_rt/i386 + make -C $BSDSRCDIR/lib/libcompiler_rt $makeFlags + make -C $BSDSRCDIR/lib/libcompiler_rt $makeFlags install - $CC -nodefaultlibs -lgcc -shared -o $out/lib/libgcc_s.so + make -C $BSDSRCDIR/lib/libgcc_eh $makeFlags + make -C $BSDSRCDIR/lib/libgcc_eh $makeFlags install - NIX_CFLAGS_COMPILE+=" -B$out/lib" - NIX_CFLAGS_COMPILE+=" -I$out/include" - NIX_LDFLAGS+=" -L$out/lib" + 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/libthr $makeFlags - make -C $BSDSRCDIR/lib/libthr $makeFlags install + NIX_CFLAGS_COMPILE+=" -B$out/lib" + NIX_CFLAGS_COMPILE+=" -I$out/include" + NIX_LDFLAGS+=" -L$out/lib" - make -C $BSDSRCDIR/lib/msun $makeFlags - make -C $BSDSRCDIR/lib/msun $makeFlags install + make -C $BSDSRCDIR/lib/libc_nonshared $makeFlags + make -C $BSDSRCDIR/lib/libc_nonshared $makeFlags install - make -C $BSDSRCDIR/lib/librpcsvc $makeFlags - make -C $BSDSRCDIR/lib/librpcsvc $makeFlags install + mkdir $BSDSRCDIR/lib/libmd/sys + make -C $BSDSRCDIR/lib/libmd $makeFlags + make -C $BSDSRCDIR/lib/libmd $makeFlags install - make -C $BSDSRCDIR/lib/libutil $makeFlags - make -C $BSDSRCDIR/lib/libutil $makeFlags install + make -C $BSDSRCDIR/lib/libthr $makeFlags + make -C $BSDSRCDIR/lib/libthr $makeFlags install - make -C $BSDSRCDIR/lib/librt $makeFlags - make -C $BSDSRCDIR/lib/librt $makeFlags install + make -C $BSDSRCDIR/lib/msun $makeFlags + make -C $BSDSRCDIR/lib/msun $makeFlags install - make -C $BSDSRCDIR/lib/libcrypt $makeFlags - make -C $BSDSRCDIR/lib/libcrypt $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/pkgs/os-specific/bsd/freebsd/pkgs/libdwarf.nix b/pkgs/os-specific/bsd/freebsd/pkgs/libdwarf.nix index 84115b626a7af..ee4d57b021b1d 100644 --- a/pkgs/os-specific/bsd/freebsd/pkgs/libdwarf.nix +++ b/pkgs/os-specific/bsd/freebsd/pkgs/libdwarf.nix @@ -1,16 +1,8 @@ { - lib, - stdenv, mkDerivation, - bsdSetupHook, - freebsdSetupHook, - makeMinimal, - install, - mandoc, - groff, m4, compatIfNeeded, - libelf, + zlib, }: mkDerivation { @@ -22,16 +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/pkgs/os-specific/bsd/freebsd/pkgs/libelf.nix b/pkgs/os-specific/bsd/freebsd/pkgs/libelf.nix deleted file mode 100644 index 881cbfcd811c8..0000000000000 --- a/pkgs/os-specific/bsd/freebsd/pkgs/libelf.nix +++ /dev/null @@ -1,35 +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/pkgs/os-specific/bsd/freebsd/pkgs/libmd.nix b/pkgs/os-specific/bsd/freebsd/pkgs/libmd.nix new file mode 100644 index 0000000000000..71d0c1e50d5ea --- /dev/null +++ b/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/pkgs/os-specific/bsd/freebsd/pkgs/libnetbsd/package.nix b/pkgs/os-specific/bsd/freebsd/pkgs/libnetbsd/package.nix index 80ea685a3162f..82a9e140102f6 100644 --- a/pkgs/os-specific/bsd/freebsd/pkgs/libnetbsd/package.nix +++ b/pkgs/os-specific/bsd/freebsd/pkgs/libnetbsd/package.nix @@ -2,7 +2,6 @@ lib, stdenv, mkDerivation, - patchesRoot, bsdSetupHook, freebsdSetupHook, makeMinimal, @@ -10,7 +9,6 @@ groff, boot-install, install, - compatIfNeeded, }: mkDerivation { @@ -23,13 +21,8 @@ mkDerivation { groff (if stdenv.hostPlatform == stdenv.buildPlatform then boot-install else install) ]; - patches = lib.optionals (!stdenv.hostPlatform.isFreeBSD) [ - /${patchesRoot}/libnetbsd-do-install.patch - #/${patchesRoot}/libnetbsd-define-__va_list.patch - ]; 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/pkgs/os-specific/bsd/freebsd/pkgs/libspl.nix b/pkgs/os-specific/bsd/freebsd/pkgs/libspl.nix index da5445a09fcda..c444975549ad6 100644 --- a/pkgs/os-specific/bsd/freebsd/pkgs/libspl.nix +++ b/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/pkgs/os-specific/bsd/freebsd/pkgs/libutil.nix b/pkgs/os-specific/bsd/freebsd/pkgs/libutil.nix index 683396d140c2e..6df6fa740f45e 100644 --- a/pkgs/os-specific/bsd/freebsd/pkgs/libutil.nix +++ b/pkgs/os-specific/bsd/freebsd/pkgs/libutil.nix @@ -6,6 +6,5 @@ mkDerivation { path = "lib/libutil"; extraPaths = [ "lib/libc/gen" ]; - clangFixup = true; MK_TESTS = "no"; } diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/lorder.nix b/pkgs/os-specific/bsd/freebsd/pkgs/lorder.nix index abbe2079855ed..25e7f491a1c94 100644 --- a/pkgs/os-specific/bsd/freebsd/pkgs/lorder.nix +++ b/pkgs/os-specific/bsd/freebsd/pkgs/lorder.nix @@ -3,8 +3,7 @@ bsdSetupHook, freebsdSetupHook, }: - -mkDerivation rec { +mkDerivation { path = "usr.bin/lorder"; noCC = true; dontBuild = true; diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/makeMinimal.nix b/pkgs/os-specific/bsd/freebsd/pkgs/makeMinimal.nix index c510a4da4b825..069e74474852a 100644 --- a/pkgs/os-specific/bsd/freebsd/pkgs/makeMinimal.nix +++ b/pkgs/os-specific/bsd/freebsd/pkgs/makeMinimal.nix @@ -7,7 +7,7 @@ freebsdSetupHook, }: -mkDerivation rec { +mkDerivation { inherit (make) path; buildInputs = [ ]; @@ -25,6 +25,8 @@ mkDerivation rec { ${make.postPatch} ''; + configureFlags = [ "--with-filemon=no" ]; + buildPhase = '' runHook preBuild diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/mkDerivation.nix b/pkgs/os-specific/bsd/freebsd/pkgs/mkDerivation.nix index b5c962064fad2..be195b3bc6fa5 100644 --- a/pkgs/os-specific/bsd/freebsd/pkgs/mkDerivation.nix +++ b/pkgs/os-specific/bsd/freebsd/pkgs/mkDerivation.nix @@ -2,11 +2,12 @@ lib, stdenv, stdenvNoCC, + versionData, + writeText, + patches, compatIfNeeded, - runCommand, - rsync, freebsd-lib, - source, + filterSource, bsdSetupHook, freebsdSetupHook, makeMinimal, @@ -24,21 +25,13 @@ lib.makeOverridable ( 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 - ''; - - extraPaths = [ ]; + pname = "${attrs.pname or (baseNameOf attrs.path)}"; + src = filterSource { + inherit pname; + inherit (attrs) path; + extraPaths = attrs.extraPaths or [ ]; + }; nativeBuildInputs = [ bsdSetupHook @@ -48,8 +41,8 @@ lib.makeOverridable ( tsort lorder mandoc - groff # statHook - ]; + groff + ] ++ attrs.extraNativeBuildInputs or [ ]; buildInputs = compatIfNeeded; HOST_SH = stdenv'.shell; @@ -72,11 +65,17 @@ lib.makeOverridable ( strictDeps = true; - meta = with lib; { - maintainers = with maintainers; [ ericson2314 ]; - platforms = platforms.unix; - license = licenses.bsd2; - }; + 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? @@ -95,5 +94,71 @@ lib.makeOverridable ( 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/pkgs/os-specific/bsd/freebsd/pkgs/mkcsmapper.nix b/pkgs/os-specific/bsd/freebsd/pkgs/mkcsmapper.nix new file mode 100644 index 0000000000000..60cef347446ec --- /dev/null +++ b/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/pkgs/os-specific/bsd/freebsd/pkgs/mkesdb.nix b/pkgs/os-specific/bsd/freebsd/pkgs/mkesdb.nix new file mode 100644 index 0000000000000..a503af529f274 --- /dev/null +++ b/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/pkgs/os-specific/bsd/freebsd/pkgs/mtree.nix b/pkgs/os-specific/bsd/freebsd/pkgs/mtree.nix index 23a4672069e6a..bbcaff3a1c6a8 100644 --- a/pkgs/os-specific/bsd/freebsd/pkgs/mtree.nix +++ b/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/pkgs/os-specific/bsd/freebsd/pkgs/rpcgen/package.nix b/pkgs/os-specific/bsd/freebsd/pkgs/rpcgen/package.nix index 409064f2b65dc..e187cacbb0d05 100644 --- a/pkgs/os-specific/bsd/freebsd/pkgs/rpcgen/package.nix +++ b/pkgs/os-specific/bsd/freebsd/pkgs/rpcgen/package.nix @@ -5,7 +5,7 @@ patchesRoot, }: -mkDerivation rec { +mkDerivation { path = "usr.bin/rpcgen"; patches = lib.optionals (stdenv.hostPlatform.libc == "glibc") [ # `WUNTRACED` is defined privately `bits/waitflags.h` in glibc. @@ -22,6 +22,6 @@ mkDerivation rec { # # This hacks around this by manually including `WUNTRACED` until # the problem is fixed properly in glibc. - /${patchesRoot}/rpcgen-glibc-hack.patch + ./rpcgen-glibc-hack.patch ]; } diff --git a/pkgs/os-specific/bsd/freebsd/patches/13.1/rpcgen-glibc-hack.patch b/pkgs/os-specific/bsd/freebsd/pkgs/rpcgen/rpcgen-glibc-hack.patch index 3dde1a0106514..3dde1a0106514 100644 --- a/pkgs/os-specific/bsd/freebsd/patches/13.1/rpcgen-glibc-hack.patch +++ b/pkgs/os-specific/bsd/freebsd/pkgs/rpcgen/rpcgen-glibc-hack.patch diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/sed.nix b/pkgs/os-specific/bsd/freebsd/pkgs/sed.nix index 07b55afe133fc..ec5bfee17d2c1 100644 --- a/pkgs/os-specific/bsd/freebsd/pkgs/sed.nix +++ b/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/pkgs/os-specific/bsd/freebsd/pkgs/source.nix b/pkgs/os-specific/bsd/freebsd/pkgs/source.nix index 5e31f900e8216..c14d26559047b 100644 --- a/pkgs/os-specific/bsd/freebsd/pkgs/source.nix +++ b/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/pkgs/os-specific/bsd/freebsd/pkgs/sys/package.nix b/pkgs/os-specific/bsd/freebsd/pkgs/sys/package.nix index 50fff7738919b..86f847cbd45cf 100644 --- a/pkgs/os-specific/bsd/freebsd/pkgs/sys/package.nix +++ b/pkgs/os-specific/bsd/freebsd/pkgs/sys/package.nix @@ -2,7 +2,6 @@ stdenv, mkDerivation, freebsd-lib, - patchesRoot, buildPackages, bsdSetupHook, freebsdSetupHook, @@ -15,7 +14,7 @@ file2c, gawk, uudecode, - xargs-j, # , ctfconvert + xargs-j, }: mkDerivation ( @@ -39,12 +38,6 @@ mkDerivation ( gawk uudecode xargs-j - #ctfconvert - ]; - - patches = [ - /${patchesRoot}/sys-gnu-date.patch - /${patchesRoot}/sys-no-explicit-intrinsics-dep.patch ]; # --dynamic-linker /red/herring is used when building the kernel. diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/tsort.nix b/pkgs/os-specific/bsd/freebsd/pkgs/tsort.nix index ab0101789f491..04a45ff980cba 100644 --- a/pkgs/os-specific/bsd/freebsd/pkgs/tsort.nix +++ b/pkgs/os-specific/bsd/freebsd/pkgs/tsort.nix @@ -1,4 +1,5 @@ { + lib, mkDerivation, bsdSetupHook, freebsdSetupHook, @@ -10,6 +11,12 @@ mkDerivation { path = "usr.bin/tsort"; + extraPaths = [ ]; + outputs = [ "out" ]; + MK_TESTS = "no"; + makeFlags = [ + "STRIP=-s" # flag to install, not command + ]; nativeBuildInputs = [ bsdSetupHook freebsdSetupHook diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/netbsdSetupHook/setup-hook.sh b/pkgs/os-specific/bsd/netbsd/pkgs/netbsdSetupHook/setup-hook.sh index fa8b19e7d8ce4..ef00ea418e535 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/netbsdSetupHook/setup-hook.sh +++ b/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/pkgs/os-specific/bsd/setup-hook.sh b/pkgs/os-specific/bsd/setup-hook.sh index e0afefcd73f71..f9453708ab5db 100644 --- a/pkgs/os-specific/bsd/setup-hook.sh +++ b/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/pkgs/os-specific/darwin/raycast/default.nix b/pkgs/os-specific/darwin/raycast/default.nix index b6626c4d4eade..b985668b21dc7 100644 --- a/pkgs/os-specific/darwin/raycast/default.nix +++ b/pkgs/os-specific/darwin/raycast/default.nix @@ -10,12 +10,12 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "raycast"; - version = "1.72.0"; + version = "1.73.0"; src = fetchurl { name = "Raycast.dmg"; url = "https://releases.raycast.com/releases/${finalAttrs.version}/download?build=universal"; - hash = "sha256-L6CXWRmBfit+uWODEWt7u71shFAadPOqtNifMnSp0BU="; + hash = "sha256-TiHFuU54+IDBrdIMSI397ysm8uOb2/oRhSyoy+5yzTw="; }; dontPatch = true; diff --git a/pkgs/os-specific/linux/firmware/ipu6-camera-bins/default.nix b/pkgs/os-specific/linux/firmware/ipu6-camera-bins/default.nix index 71a7cd9e947b5..31ac23df39606 100644 --- a/pkgs/os-specific/linux/firmware/ipu6-camera-bins/default.nix +++ b/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/pkgs/os-specific/linux/firmware/ivsc-firmware/default.nix b/pkgs/os-specific/linux/firmware/ivsc-firmware/default.nix index e2f2fd4f9fee0..3ad52b314537d 100644 --- a/pkgs/os-specific/linux/firmware/ivsc-firmware/default.nix +++ b/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/pkgs/os-specific/linux/ipu6-drivers/default.nix b/pkgs/os-specific/linux/ipu6-drivers/default.nix index fe9cb1da018c6..276926fef8aa6 100644 --- a/pkgs/os-specific/linux/ipu6-drivers/default.nix +++ b/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/pkgs/os-specific/linux/ivsc-driver/default.nix b/pkgs/os-specific/linux/ivsc-driver/default.nix index 72173de49baa5..5612c9170abd4 100644 --- a/pkgs/os-specific/linux/ivsc-driver/default.nix +++ b/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/pkgs/os-specific/linux/libbpf/0.x.nix b/pkgs/os-specific/linux/libbpf/0.x.nix index 480e78d0803a8..b34cca4a51af4 100644 --- a/pkgs/os-specific/linux/libbpf/0.x.nix +++ b/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/pkgs/os-specific/linux/rtl8189es/default.nix b/pkgs/os-specific/linux/rtl8189es/default.nix index e31a54f56c31a..553c6a309682e 100644 --- a/pkgs/os-specific/linux/rtl8189es/default.nix +++ b/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/pkgs/os-specific/linux/rtl8189fs/default.nix b/pkgs/os-specific/linux/rtl8189fs/default.nix index 67642f11d3222..0405fc8561a9b 100644 --- a/pkgs/os-specific/linux/rtl8189fs/default.nix +++ b/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/pkgs/os-specific/linux/rtl8192eu/default.nix b/pkgs/os-specific/linux/rtl8192eu/default.nix index 32b97b59c52ea..529f16fc1db4f 100644 --- a/pkgs/os-specific/linux/rtl8192eu/default.nix +++ b/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/pkgs/os-specific/linux/rtl8723ds/default.nix b/pkgs/os-specific/linux/rtl8723ds/default.nix index be4b954c1b618..a9c1f18de0c2a 100644 --- a/pkgs/os-specific/linux/rtl8723ds/default.nix +++ b/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/pkgs/os-specific/linux/rtl8812au/default.nix b/pkgs/os-specific/linux/rtl8812au/default.nix index ed330fc246375..d9fd92c4a9f09 100644 --- a/pkgs/os-specific/linux/rtl8812au/default.nix +++ b/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/pkgs/os-specific/linux/rtl8821cu/default.nix b/pkgs/os-specific/linux/rtl8821cu/default.nix index 806df9f6dd4d8..9d83d4b4c28a1 100644 --- a/pkgs/os-specific/linux/rtl8821cu/default.nix +++ b/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/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 6e48b7665ad84..546f1bb9020d6 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "2024.5.2"; + version = "2024.5.3"; components = { "3_day_blinds" = ps: with ps; [ ]; diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/android-tv-card/default.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/android-tv-card/default.nix index 5382a0655f968..34fc23dfcc881 100644 --- a/pkgs/servers/home-assistant/custom-lovelace-modules/android-tv-card/default.nix +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/android-tv-card/default.nix @@ -5,18 +5,18 @@ buildNpmPackage rec { pname = "android-tv-card"; - version = "3.6.1"; + version = "3.7.0"; src = fetchFromGitHub { owner = "Nerwyn"; repo = "android-tv-card"; rev = version; - hash = "sha256-bVfaB5s4b0bu8RiPGoyuPzhe2otCPugldmoVQuYX3P8="; + hash = "sha256-6SwSoFeGS3kzk4jz+vSVb8ENMcSFxaunyTzuPe1kHBI="; }; patches = [ ./dont-call-git.patch ]; - npmDepsHash = "sha256-yLIf+VXrNF81pq8dbPa+JplNZqhrRnXHEdEk6wJN98A="; + npmDepsHash = "sha256-QO3IAd7RC8VBa2YjQVn4HUm64mQL86OuAhjJO0Oo94M="; installPhase = '' runHook preInstall diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index ed315a18df97e..745e7df93be65 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -529,7 +529,7 @@ let extraBuildInputs = extraPackages python.pkgs; # Don't forget to run update-component-packages.py after updating - hassVersion = "2024.5.2"; + hassVersion = "2024.5.3"; in python.pkgs.buildPythonApplication rec { pname = "homeassistant"; @@ -547,13 +547,13 @@ in python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = "refs/tags/${version}"; - hash = "sha256-OdtkkZ8Yl6H2dUBILrT/02ML3MnptdBydVzKhxoKjAY="; + hash = "sha256-KNuBv3BSEkIBEN9rC4vqJcd8TE4ik/BlF3IB+ZTu4Pk="; }; # Secondary source is pypi sdist for translations sdist = fetchPypi { inherit pname version; - hash = "sha256-5ASuTREkAUCS94Ur5yNHU8ISrASGl90scyYWBHiKlKI="; + hash = "sha256-0asL9TAzAASPq8ytA8HhyaOUgfVUzQPsZJCz1TUygf4="; }; build-system = with python.pkgs; [ @@ -567,6 +567,7 @@ in python.pkgs.buildPythonApplication rec { "bcrypt" "ciso8601" "cryptography" + "jinja2" "hass-nabucasa" "httpx" "orjson" diff --git a/pkgs/servers/home-assistant/stubs.nix b/pkgs/servers/home-assistant/stubs.nix index dd86f22447451..f09d06370eafc 100644 --- a/pkgs/servers/home-assistant/stubs.nix +++ b/pkgs/servers/home-assistant/stubs.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "homeassistant-stubs"; - version = "2024.5.2"; + version = "2024.5.3"; format = "pyproject"; disabled = python.version != home-assistant.python.version; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "KapJI"; repo = "homeassistant-stubs"; rev = "refs/tags/${version}"; - hash = "sha256-bgXHEz8YuHcdGYzLpM7H8IVXixFC8Bz0i4SaatA49Qo="; + hash = "sha256-cWt5hOLnri+m7WXAjCA3z1k5ctDia2sAoZiyGe8zadI="; }; nativeBuildInputs = [ diff --git a/pkgs/servers/home-assistant/tests.nix b/pkgs/servers/home-assistant/tests.nix index 989bfccb7236d..07e9ab99800b4 100644 --- a/pkgs/servers/home-assistant/tests.nix +++ b/pkgs/servers/home-assistant/tests.nix @@ -49,9 +49,21 @@ let }; extraDisabledTests = { - private_ble_device = [ - # AssertionError: assert '90' == '90.0' - "test_estimated_broadcast_interval" + advantage_air = [ + # AssertionError: assert 2 == 1 (Expected two calls, got one) + "test_binary_sensor_async_setup_entry" + ]; + hassio = [ + # fails to load the hardware component + "test_device_registry_calls" + ]; + husqvarna_automower = [ + # snapshot mismatch + "test_device_diagnostics" + ]; + recorder = [ + # call not happening, likely due to timezone issues + "test_auto_purge" ]; shell_command = [ # tries to retrieve file from github @@ -61,6 +73,10 @@ let # missing operating_status attribute in entity "test_sensor_entities" ]; + websocket_api = [ + # racy + "test_render_template_with_timeout" + ]; }; extraPytestFlagsArray = { diff --git a/pkgs/servers/klipper/simulator.cfg b/pkgs/servers/klipper/simulator.cfg index 6a4122ce3aa5f..11e8d77b03c3a 100644 --- a/pkgs/servers/klipper/simulator.cfg +++ b/pkgs/servers/klipper/simulator.cfg @@ -23,6 +23,7 @@ CONFIG_WANT_DISPLAYS=y CONFIG_WANT_SENSORS=y CONFIG_WANT_LIS2DW=y CONFIG_WANT_SOFTWARE_SPI=y +CONFIG_NEED_SENSOR_BULK=y CONFIG_CANBUS_FREQUENCY=1000000 CONFIG_HAVE_GPIO=y CONFIG_HAVE_GPIO_ADC=y diff --git a/pkgs/servers/matrix-synapse/sliding-sync/default.nix b/pkgs/servers/matrix-synapse/sliding-sync/default.nix index c8f545813538d..b0fc3c27f9c21 100644 --- a/pkgs/servers/matrix-synapse/sliding-sync/default.nix +++ b/pkgs/servers/matrix-synapse/sliding-sync/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "matrix-sliding-sync"; - version = "0.99.16"; + version = "0.99.17"; src = fetchFromGitHub { owner = "matrix-org"; repo = "sliding-sync"; rev = "refs/tags/v${version}"; - hash = "sha256-RMA6Nwdajd1ABaNGq4iGNhX+/FCVy8HcNPpcW/mWtcc="; + hash = "sha256-tzhz2Jlhvn2blO5jdWNS++V28kNXmmg+a2BU7g5zTx0="; }; vendorHash = "sha256-THjvc0TepIBFOTte7t63Dmadf3HMuZ9m0YzQMI5e5Pw="; diff --git a/pkgs/servers/metabase/default.nix b/pkgs/servers/metabase/default.nix index c75b4854daa55..79dd808eab29b 100644 --- a/pkgs/servers/metabase/default.nix +++ b/pkgs/servers/metabase/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "metabase"; - version = "0.49.2"; + version = "0.49.9"; src = fetchurl { url = "https://downloads.metabase.com/v${version}/metabase.jar"; - hash = "sha256-PmfzYPnfIFX92I0tnXJoZa3EdOF7EFo5bc0T9bo4bS0="; + hash = "sha256-1QUrXYpMvn/Gm8ljmF5MYKFRCIQ/v3vpoMJEJcSR2vI="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/mir/default.nix b/pkgs/servers/mir/default.nix index e4555bf517f69..047d76dbc74f7 100644 --- a/pkgs/servers/mir/default.nix +++ b/pkgs/servers/mir/default.nix @@ -31,6 +31,7 @@ , xorg , xwayland , dbus +, gobject-introspection , gtest , umockdev , wlcs @@ -130,6 +131,7 @@ stdenv.mkDerivation (finalAttrs: { nativeCheckInputs = [ dbus + gobject-introspection ]; checkInputs = [ diff --git a/pkgs/servers/monitoring/prometheus/default.nix b/pkgs/servers/monitoring/prometheus/default.nix index b511faf42fb64..f7cc47311ef23 100644 --- a/pkgs/servers/monitoring/prometheus/default.nix +++ b/pkgs/servers/monitoring/prometheus/default.nix @@ -31,10 +31,10 @@ }: let - version = "2.49.1"; + version = "2.52.0"; webUiStatic = fetchurl { url = "https://github.com/prometheus/prometheus/releases/download/v${version}/prometheus-web-ui-${version}.tar.gz"; - hash = "sha256-cHMzu7/WquRvbCUlAs4U6PrLP4PAigdYOyNbvxNoeIA="; + hash = "sha256-/HTNDu/msUFLiqbD5ryVPlDOqfAT+8MEGNusmu3xH1w="; }; in buildGoModule rec { @@ -47,10 +47,10 @@ buildGoModule rec { owner = "prometheus"; repo = "prometheus"; rev = "v${version}"; - hash = "sha256-cqUyjRL+T7ARGcUWMCaeWMo7DR1gvPp08maNz9a3RG0="; + hash = "sha256-7HLSSls1aMZ6Zju2F9dArTFsCSESxDxWQ1a0QgD5Nxo="; }; - vendorHash = "sha256-fDT7YrnUfS93yseo+1mLrSGPBewm7CpcHPCz1kxM6Uo="; + vendorHash = "sha256-IzYYfB8cvvQAsOqEREVaCe80V3hhhmOEYsl9E9NJq20="; excludedPackages = [ "documentation/prometheus-mixin" ]; diff --git a/pkgs/servers/monitoring/prometheus/dnsmasq-exporter.nix b/pkgs/servers/monitoring/prometheus/dnsmasq-exporter.nix index eb2297648b569..f891fdaeb856f 100644 --- a/pkgs/servers/monitoring/prometheus/dnsmasq-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/dnsmasq-exporter.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "dnsmasq_exporter"; - version = "0.2.0"; + version = "unstable-2024-05-06"; src = fetchFromGitHub { owner = "google"; repo = "dnsmasq_exporter"; - rev = "v${version}"; - hash = "sha256-8r5q5imI+MxnU7+TFqdIc+JRX0zZY4pmUoAGlFqs8cQ="; + rev = "03f84edc208fa88e31cf00533db42e7e0c9717ca"; + hash = "sha256-YFQ4XO3vnj2Ka3D/LS5aG6WX+qOCVTlq5khDxLoQllo="; }; - vendorHash = "sha256-dEM0mn3JJl0M6ImWmkuvwBSfGWkhpVvZE7GtC1BQF7c="; + vendorHash = "sha256-oD68TCNJKwjY3iwE/pUosMIMGOhsWj9cHC/+hq3xxI4="; doCheck = false; diff --git a/pkgs/servers/nosql/apache-jena/fuseki-binary.nix b/pkgs/servers/nosql/apache-jena/fuseki-binary.nix index d748cdb7c4ebe..9817de91766f1 100644 --- a/pkgs/servers/nosql/apache-jena/fuseki-binary.nix +++ b/pkgs/servers/nosql/apache-jena/fuseki-binary.nix @@ -24,9 +24,12 @@ stdenv.mkDerivation rec { chmod +x $out/fuseki ln -s "$out"/{fuseki-backup,fuseki-server,fuseki} "$out/bin" for i in "$out"/bin/*; do + # It is necessary to set the default $FUSEKI_BASE directory to a writable location + # By default it points to $FUSEKI_HOME/run which is in the nix store wrapProgram "$i" \ --prefix "PATH" : "${java}/bin/:${coreutils}/bin:${which}/bin" \ --set-default "FUSEKI_HOME" "$out" \ + --run "if [ -z \"\$FUSEKI_BASE\" ]; then export FUSEKI_BASE=\"\$HOME/.local/fuseki\" ; mkdir -p \"\$HOME/.local/fuseki\" ; fi" \ ; done ''; @@ -40,7 +43,9 @@ stdenv.mkDerivation rec { license = licenses.asl20; maintainers = with maintainers; [ raskin ]; platforms = platforms.all; + sourceProvenance = with sourceTypes; [ binaryBytecode binaryNativeCode ]; homepage = "https://jena.apache.org"; downloadPage = "https://archive.apache.org/dist/jena/binaries/"; + mainProgram = "fuseki"; }; } diff --git a/pkgs/servers/redpanda/default.nix b/pkgs/servers/redpanda/default.nix index 97d8aafa0831c..6ecb383aab2dd 100644 --- a/pkgs/servers/redpanda/default.nix +++ b/pkgs/servers/redpanda/default.nix @@ -7,12 +7,12 @@ , stdenv }: let - version = "23.3.14"; + version = "23.3.15"; src = fetchFromGitHub { owner = "redpanda-data"; repo = "redpanda"; rev = "v${version}"; - sha256 = "sha256-xFXcxtWTVRg+ZgxKfIU32JF0hRXzsLMwS9fSwge3/bc="; + sha256 = "sha256-hd6pxuKQspdN19dytxWmhO2OzFYobBLYkoB7i9r6Izc="; }; server = callPackage ./server.nix { inherit src version; }; in diff --git a/pkgs/servers/snac2/default.nix b/pkgs/servers/snac2/default.nix index e15add96d644e..9c2594c80f999 100644 --- a/pkgs/servers/snac2/default.nix +++ b/pkgs/servers/snac2/default.nix @@ -10,14 +10,14 @@ stdenv.mkDerivation rec { pname = "snac2"; - version = "2.51"; + version = "2.52"; src = fetchFromGitea { domain = "codeberg.org"; owner = "grunfink"; repo = pname; rev = version; - hash = "sha256-ahUWHWtVgJksOg6CTqJSQBaD577zaNu4u1sDG0ksr4g="; + hash = "sha256-2dDIbY6IaB53BbtNtzyOrigjzkGk7By2N2zZSuQhDAs="; }; buildInputs = [ curl openssl ]; diff --git a/pkgs/servers/web-apps/wordpress/packages/languages.json b/pkgs/servers/web-apps/wordpress/packages/languages.json index d71f4b0992285..d2ca31b5af301 100644 --- a/pkgs/servers/web-apps/wordpress/packages/languages.json +++ b/pkgs/servers/web-apps/wordpress/packages/languages.json @@ -1,20 +1,20 @@ { "de_DE": { "path": "de_DE", - "rev": "1416209", - "sha256": "1ffs7qjn9qp6s40v7z4ngm062wapjbhg2fihp7p4nb4ki3gf2yh9", + "rev": "1436223", + "sha256": "0yc9h1c5pqqy7n3x5ss9vxizb1qyalx2srnwkfnhgl0f103ry7hc", "version": "6.5" }, "fr_FR": { "path": "fr_FR", - "rev": "1412485", - "sha256": "06h4vg0kcybvf6v04sf6iyi8bw1bjjzpicdv90acdb049q5vc4x3", + "rev": "1436240", + "sha256": "014n9zk6adlzk2ayd5f5hm97ybn8b5l5h589576hsmv30crivqsq", "version": "6.5" }, "ro_RO": { "path": "ro_RO", - "rev": "1410752", - "sha256": "1j4ypjgm1qghr18cll7iwr7qhdcffakzpj83lb391fyr2b3s7liq", + "rev": "1436218", + "sha256": "15issr2hnq9fci7kkw42aqqxj5vq154v91xy6mhppp2079g93c63", "version": "6.5" } } diff --git a/pkgs/servers/web-apps/wordpress/packages/plugins.json b/pkgs/servers/web-apps/wordpress/packages/plugins.json index 3223a250481fe..e3702cb34d23e 100644 --- a/pkgs/servers/web-apps/wordpress/packages/plugins.json +++ b/pkgs/servers/web-apps/wordpress/packages/plugins.json @@ -24,22 +24,22 @@ "version": "2.21.08.31" }, "breeze": { - "path": "breeze/tags/2.1.6", - "rev": "3051666", - "sha256": "0926fxbxkw06g6828s0yx017zp1sr60lh2b9cdgil0fxwc5ga26z", - "version": "2.1.6" + "path": "breeze/tags/2.1.7", + "rev": "3074984", + "sha256": "13alrv92p70ccg8xjybfzzikv35ff24zkc3dxlbrlr62ikczyyy0", + "version": "2.1.7" }, "co-authors-plus": { - "path": "co-authors-plus/tags/3.5.15", - "rev": "2959167", - "sha256": "1n01sk2vgiym25wvxi4igpx773ph59y5f5lvwaasilamdpw0lzh4", - "version": "3.5.15" + "path": "co-authors-plus/tags/3.6.1", + "rev": "3077160", + "sha256": "10733qibrcrshm3c9zjxhwqar2fg60na70npam1z2lz6gnwmwdqn", + "version": "3.6.1" }, "code-syntax-block": { - "path": "code-syntax-block/tags/3.1.1", - "rev": "2747615", - "sha256": "0dqdsl7f3ihshvly6cqd5l4cbimx5skmips514wvifspwggwmmjm", - "version": "3.1.1" + "path": "code-syntax-block/tags/3.2.1", + "rev": "3083143", + "sha256": "0hcvix71g2nh2yws0j3rll2dk3ybf39i04m7qz9yrnva6s17g6l6", + "version": "3.2.1" }, "cookie-notice": { "path": "cookie-notice/tags/2.4.16", @@ -60,10 +60,16 @@ "version": "1.4.0" }, "gutenberg": { - "path": "gutenberg/tags/18.1.0", - "rev": "3068196", - "sha256": "0ajkm54m4g6xg10263hjwdy2jigcaiqczg5dla7c457jqg8jv4nv", - "version": "18.1.0" + "path": "gutenberg/tags/18.3.0", + "rev": "3083588", + "sha256": "0dl6hdi38988zpcl69avy1p8s93djlzk6f56ra490lvzlmf4g73z", + "version": "18.3.0" + }, + "hcaptcha-for-forms-and-more": { + "path": "hcaptcha-for-forms-and-more/tags/4.1.1", + "rev": "3081325", + "sha256": "1sw42qpy3qqz48a86fd5dc71iq6s1q44v5mgq7fa49makkn5fd4r", + "version": "4.1.1" }, "hello-dolly": { "path": "hello-dolly/tags/1.7.2", @@ -78,10 +84,10 @@ "version": "3.0.2" }, "jetpack": { - "path": "jetpack/tags/13.3.1", - "rev": "3068650", - "sha256": "0fwigf6xg5y5nqfkk2nv08qyqp97v96rnccx2a72p19a6dq6b97x", - "version": "13.3.1" + "path": "jetpack/tags/13.4.1", + "rev": "3084434", + "sha256": "17fg162f5nqf87xi0bii9xsgc19vfd9hrf86b82c4m6sgb80rf2p", + "version": "13.4.1" }, "jetpack-lite": { "path": "jetpack-lite/tags/3.0.3", @@ -102,10 +108,10 @@ "version": "2.09" }, "mailpoet": { - "path": "mailpoet/tags/4.48.2", - "rev": "3067726", - "sha256": "13brfys3xmpmw5yd1wn826mrzxvb6312177l7hmr6mhk0adp5lhz", - "version": "4.48.2" + "path": "mailpoet/tags/4.50.0", + "rev": "3083197", + "sha256": "01z2r87jw94ap9ha8kz1l999pczpa6985j4z0nq44b20672p62gv", + "version": "4.50.0" }, "merge-minify-refresh": { "path": "merge-minify-refresh/trunk", @@ -137,6 +143,12 @@ "sha256": "1mrwgqp1ril54xqr8k2gwgjcsbf4xv3671v15xawapwz730h2c4r", "version": "0.10.0" }, + "surge": { + "path": "surge/tags/1.1.0", + "rev": "3030901", + "sha256": "1bg99gsxv32l62pv0n2pq0384ggk2p154pg79yxiwnab2mrrs8j2", + "version": "1.1.0" + }, "tc-custom-javascript": { "path": "tc-custom-javascript/tags/1.2.3", "rev": "2870386", @@ -156,10 +168,10 @@ "version": "0.25.9" }, "wordpress-seo": { - "path": "wordpress-seo/tags/22.5", - "rev": "3071371", - "sha256": "0jwkicd8zf6ggf2qf2r1ndgj2k208n9bwvjrd7k3gg09jwsccgab", - "version": "22.5" + "path": "wordpress-seo/tags/22.6", + "rev": "3079171", + "sha256": "105646vkdvnrwa6kbk8vhvp40l5rg5dnd0rs21qg7byw7xv61nzs", + "version": "22.6" }, "worker": { "path": "worker/tags/4.9.19", @@ -174,10 +186,10 @@ "version": "2.0" }, "wp-fastest-cache": { - "path": "wp-fastest-cache/tags/1.2.5", - "rev": "3065036", - "sha256": "0q3ra4xry8jbvnx7nxj6a8jjyrni6faa8ys0s2ikaf6jf3r9skqa", - "version": "1.2.5" + "path": "wp-fastest-cache/tags/1.2.6", + "rev": "3081800", + "sha256": "0pp8di9jaj13k0qdpcnwx825nzx8cd9h336li8swg3jbr3sppvl7", + "version": "1.2.6" }, "wp-gdpr-compliance": { "path": "wp-gdpr-compliance/tags/2.0.22", @@ -192,10 +204,10 @@ "version": "4.0.1" }, "wp-statistics": { - "path": "wp-statistics/tags/14.6.1", - "rev": "3070028", - "sha256": "0qrhfqbn51cgyr0y3v4hxpnkhsk829i62c3ccy6a34gf5fxhrjnl", - "version": "14.6.1" + "path": "wp-statistics/tags/14.6.4", + "rev": "3081064", + "sha256": "03834h6vcczcbmw7h3db6bk39qr9yipgsn8q9mwa43rq7h7b7pvh", + "version": "14.6.4" }, "wp-swiper": { "path": "wp-swiper/trunk", @@ -210,9 +222,9 @@ "version": "1.4.1" }, "wpforms-lite": { - "path": "wpforms-lite/tags/1.8.7.2", - "rev": "3043142", - "sha256": "1na6vlvnvni9vqg99i1ab49z5cyy6kyqf197ph8r79nc46lyxa5a", - "version": "1.8.7.2" + "path": "wpforms-lite/tags/1.8.8.3", + "rev": "3077484", + "sha256": "03glhjxsrw6n884qkxrizbs6i4d7b1bl9m2zj7f32p0bq466hm6r", + "version": "1.8.8.3" } } diff --git a/pkgs/servers/web-apps/wordpress/packages/wordpress-plugins.json b/pkgs/servers/web-apps/wordpress/packages/wordpress-plugins.json index f8e8074ab82c8..83d3b6d1edae6 100644 --- a/pkgs/servers/web-apps/wordpress/packages/wordpress-plugins.json +++ b/pkgs/servers/web-apps/wordpress/packages/wordpress-plugins.json @@ -10,6 +10,7 @@ , "disable-xml-rpc": "gpl2Plus" , "embed-extended": "gpl2Plus" , "gutenberg": "gpl2Plus" +, "hcaptcha-for-forms-and-more": "gpl2Only" , "hello-dolly": "gpl2Plus" , "hkdev-maintenance-mode": "gpl2Plus" , "jetpack": "gpl2Plus" @@ -22,6 +23,7 @@ , "simple-login-captcha": "gpl2Plus" , "simple-mastodon-verification": "gpl2Plus" , "static-mail-sender-configurator": "mit" +, "surge": "gpl3Only" , "tc-custom-javascript": "gpl2Plus" , "webp-converter-for-media": "gpl2Plus" , "webp-express": "gpl3Only" diff --git a/pkgs/servers/x11/xorg/xwayland.nix b/pkgs/servers/x11/xorg/xwayland.nix index a34e1285e3071..66a71c1fa3be6 100644 --- a/pkgs/servers/x11/xorg/xwayland.nix +++ b/pkgs/servers/x11/xorg/xwayland.nix @@ -1,6 +1,7 @@ { egl-wayland , libepoxy , fetchurl +, fetchpatch , fontutil , lib , libei @@ -53,6 +54,17 @@ stdenv.mkDerivation rec { hash = "sha256-HJo2a058ytug+b0xPFnq4S0jvXJUOyKibq+LIINc/G0="; }; + patches = [ + # Backport fix for libei scrolling + # Notably affects Steam Input, but also anything else using xtest + # FIXME: remove when merged + # Upstream PR: https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1531 + (fetchpatch { + url = "https://gitlab.freedesktop.org/xorg/xserver/-/commit/317712eb5a1aa4a1c3d737a8fcaee57add9981c9.patch"; + hash = "sha256-TZo38Pyr9IJUF+3bqlmF4M84XGgo9G6WFTvbaP9r0XU="; + }) + ]; + depsBuildBuild = [ pkg-config ]; diff --git a/pkgs/servers/zigbee2mqtt/default.nix b/pkgs/servers/zigbee2mqtt/default.nix index 0da5940acbee4..8f2fe4ee00ef8 100644 --- a/pkgs/servers/zigbee2mqtt/default.nix +++ b/pkgs/servers/zigbee2mqtt/default.nix @@ -8,16 +8,16 @@ buildNpmPackage rec { pname = "zigbee2mqtt"; - version = "1.37.0"; + version = "1.37.1"; src = fetchFromGitHub { owner = "Koenkk"; repo = "zigbee2mqtt"; rev = version; - hash = "sha256-YYwnIWZJowIWCUY6PNRd3xWfzoHcSrFiAa3lEE7Vvw8="; + hash = "sha256-rpFx3OveHhurwb08jl0WHf121v0L/r0FQCIpHRJ1V24="; }; - npmDepsHash = "sha256-tba/VGybkC+eQwtPhAL98+shFOSH8lIbkSQ/KHggDqM="; + npmDepsHash = "sha256-AjCeRU/Ew9UquqGPuJeGRC48kCi9uRZaI5Bam365Wwk="; buildInputs = [ systemdMinimal diff --git a/pkgs/shells/fish/plugins/default.nix b/pkgs/shells/fish/plugins/default.nix index 7b17883c2211b..36a5a59e4398e 100644 --- a/pkgs/shells/fish/plugins/default.nix +++ b/pkgs/shells/fish/plugins/default.nix @@ -36,8 +36,12 @@ lib.makeScope newScope (self: with self; { github-copilot-cli-fish = callPackage ./github-copilot-cli-fish.nix { }; + git-abbr = callPackage ./git-abbr.nix { }; + grc = callPackage ./grc.nix { }; + gruvbox = callPackage ./gruvbox.nix { }; + humantime-fish = callPackage ./humantime-fish.nix { }; hydro = callPackage ./hydro.nix { }; diff --git a/pkgs/shells/fish/plugins/git-abbr.nix b/pkgs/shells/fish/plugins/git-abbr.nix new file mode 100644 index 0000000000000..2ec33f6c7976a --- /dev/null +++ b/pkgs/shells/fish/plugins/git-abbr.nix @@ -0,0 +1,23 @@ +{ + lib, + buildFishPlugin, + fetchFromGitHub, +}: +buildFishPlugin rec { + pname = "fish-git-abbr"; + version = "0.2.1-unstable-2023-06-19"; + + src = fetchFromGitHub { + owner = "lewisacidic"; + repo = "fish-git-abbr"; + rev = "dc590a5b9d9d2095f95f7d90608b48e55bea0b0e"; + hash = "sha256-6z3Wr2t8CP85xVEp6UCYaM2KC9PX4MDyx19f/wjHkb0="; + }; + + meta = with lib; { + description = "Abbreviations for git for the fish shell 🐟"; + homepage = "https://github.com/lewisacidic/fish-git-abbr"; + license = licenses.mit; + maintainers = with maintainers; [hmajid2301]; + }; +} diff --git a/pkgs/shells/fish/plugins/gruvbox.nix b/pkgs/shells/fish/plugins/gruvbox.nix new file mode 100644 index 0000000000000..b4b85ae597b8b --- /dev/null +++ b/pkgs/shells/fish/plugins/gruvbox.nix @@ -0,0 +1,17 @@ +{ lib , buildFishPlugin , fetchFromGitHub }: +buildFishPlugin { + pname = "gruvbox"; + version = "0-unstable-2021-10-12"; + src = fetchFromGitHub { + owner = "jomik"; + repo = "fish-gruvbox"; + rev = "80a6f3a7b31beb6f087b0c56cbf3470204759d1c"; + hash = "sha256-vL2/Nm9Z9cdaptx8sJqbX5AnRtfd68x4ZKWdQk5Cngo="; + }; + meta = { + description = "Gruvbox theme for fish shell."; + homepage = "https://github.com/Jomik/fish-gruvbox"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ msladecek ]; + }; +} diff --git a/pkgs/shells/nushell/nu_scripts/default.nix b/pkgs/shells/nushell/nu_scripts/default.nix index 1b127edba0d60..d930246fdfb6e 100644 --- a/pkgs/shells/nushell/nu_scripts/default.nix +++ b/pkgs/shells/nushell/nu_scripts/default.nix @@ -6,13 +6,13 @@ stdenvNoCC.mkDerivation rec { pname = "nu_scripts"; - version = "0-unstable-2024-04-30"; + version = "0-unstable-2024-05-08"; src = fetchFromGitHub { owner = "nushell"; repo = pname; - rev = "4eab7ea772f0a288c99a79947dd332efc1884315"; - hash = "sha256-rXEtn0mO0hEH1zuDJ9vzsAeZfHnw9mkitzMqr7o5UYs="; + rev = "afde2592a6254be7c14ccac520cb608bd1adbaf9"; + hash = "sha256-jYjtmprgsRGunrDwCzsXDKPK7SOqFdl37F4VCQDKpNs="; }; installPhase = '' diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix index f229c89993604..1c6cce5c8bc84 100644 --- a/pkgs/tools/admin/awscli/default.nix +++ b/pkgs/tools/admin/awscli/default.nix @@ -8,82 +8,89 @@ , awscli }: -python3.pkgs.buildPythonApplication rec { - pname = "awscli"; - version = "1.32.58"; # N.B: if you change this, change botocore and boto3 to a matching version too - pyproject = true; +let + botocoreVersion = python3.pkgs.botocore.version; + # awscli.version should be pinned to 2 minor versions less than the botocoreVersion + versionMinor = toString (lib.toInt (lib.versions.minor botocoreVersion) - 2); + versionPatch = lib.versions.patch botocoreVersion; + self = python3.pkgs.buildPythonApplication rec { + pname = "awscli"; + version = "1.${versionMinor}.${versionPatch}"; # N.B: if you change this, change botocore and boto3 to a matching version too + pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-dffY/BKsQ7vztW2sGn+WaZB0fXnqwwVjA4nkVwRZ1js="; - }; + src = fetchPypi { + inherit pname version; + hash = "sha256-GPcXkl2H0XNaeqt2/qD5+KvW23dRB0X+zLWo9hLigQM="; + }; - nativeBuildInputs = [ - python3.pkgs.pythonRelaxDepsHook - ]; + nativeBuildInputs = [ + python3.pkgs.pythonRelaxDepsHook + ]; - pythonRelaxDeps = [ - "botocore" - "colorama" - "docutils" - "rsa" - ]; + pythonRelaxDeps = [ + # botocore must not be relaxed + "colorama" + "docutils" + "rsa" + ]; - build-system = [ - python3.pkgs.setuptools - ]; + build-system = [ + python3.pkgs.setuptools + ]; - propagatedBuildInputs = with python3.pkgs; [ - botocore - s3transfer - colorama - docutils - rsa - pyyaml - groff - less - ]; + propagatedBuildInputs = with python3.pkgs; [ + botocore + s3transfer + colorama + docutils + rsa + pyyaml + groff + less + ]; - postInstall = '' - mkdir -p $out/share/bash-completion/completions - echo "complete -C $out/bin/aws_completer aws" > $out/share/bash-completion/completions/awscli + postInstall = '' + mkdir -p $out/share/bash-completion/completions + echo "complete -C $out/bin/aws_completer aws" > $out/share/bash-completion/completions/awscli - mkdir -p $out/share/zsh/site-functions - mv $out/bin/aws_zsh_completer.sh $out/share/zsh/site-functions + mkdir -p $out/share/zsh/site-functions + mv $out/bin/aws_zsh_completer.sh $out/share/zsh/site-functions - rm $out/bin/aws.cmd - ''; + rm $out/bin/aws.cmd + ''; - doInstallCheck = true; + doInstallCheck = true; - installCheckPhase = '' - runHook preInstallCheck + installCheckPhase = '' + runHook preInstallCheck - $out/bin/aws --version | grep "${python3.pkgs.botocore.version}" - $out/bin/aws --version | grep "${version}" + $out/bin/aws --version | grep "${botocoreVersion}" + $out/bin/aws --version | grep "${version}" - runHook postInstallCheck - ''; + runHook postInstallCheck + ''; - passthru = { - python = python3; # for aws_shell - updateScript = nix-update-script { - # Excludes 1.x versions from the Github tags list - extraArgs = [ "--version-regex" "^(1\.(.*))" ]; - }; - tests.version = testers.testVersion { - package = awscli; - command = "aws --version"; - inherit version; + passthru = { + python = python3; # for aws_shell + updateScript = nix-update-script { + extraArgs = [ "--version=skip" ]; + }; + tests.version = testers.testVersion { + package = awscli; + command = "aws --version"; + inherit version; + }; }; - }; - meta = with lib; { - homepage = "https://aws.amazon.com/cli/"; - changelog = "https://github.com/aws/aws-cli/blob/${version}/CHANGELOG.rst"; - description = "Unified tool to manage your AWS services"; - license = licenses.asl20; - mainProgram = "aws"; - maintainers = with maintainers; [ anthonyroussel ]; + meta = with lib; { + homepage = "https://aws.amazon.com/cli/"; + changelog = "https://github.com/aws/aws-cli/blob/${version}/CHANGELOG.rst"; + description = "Unified tool to manage your AWS services"; + license = licenses.asl20; + mainProgram = "aws"; + maintainers = with maintainers; [ anthonyroussel ]; + }; }; -} +in +assert self ? pythonRelaxDeps -> !(lib.elem "botocore" self.pythonRelaxDeps); +self diff --git a/pkgs/tools/admin/fits-cloudctl/default.nix b/pkgs/tools/admin/fits-cloudctl/default.nix index cab43f365692d..208107856896c 100644 --- a/pkgs/tools/admin/fits-cloudctl/default.nix +++ b/pkgs/tools/admin/fits-cloudctl/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "fits-cloudctl"; - version = "0.12.18"; + version = "0.12.19"; src = fetchFromGitHub { owner = "fi-ts"; repo = "cloudctl"; rev = "v${version}"; - hash = "sha256-ScHdYSDZVs9YYIh1/U/8ZcGa9BF5L+fIHnSHWSRlB4k="; + hash = "sha256-4R+wBjlCjk/7/iucC3zptrQ5D5wtQeqdeyfJ1DiFusY="; }; - vendorHash = "sha256-7vIcfxDmO8tmVewRDx6JhOgtkKeHOk0qyFZf1U0VQs4="; + vendorHash = "sha256-mK10DxDUrEkCdumq6MM6h7B8C8P1hGE466ko3yj1kto="; meta = with lib; { description = "Command-line client for FI-TS Finance Cloud Native services"; diff --git a/pkgs/tools/admin/google-cloud-sdk/default.nix b/pkgs/tools/admin/google-cloud-sdk/default.nix index b8e49b37a8d2f..03078392264da 100644 --- a/pkgs/tools/admin/google-cloud-sdk/default.nix +++ b/pkgs/tools/admin/google-cloud-sdk/default.nix @@ -13,7 +13,7 @@ let pythonEnv = python.withPackages (p: with p; [ cffi cryptography - openssl + pyopenssl crcmod numpy ] ++ lib.optional (with-gce) google-compute-engine); diff --git a/pkgs/tools/admin/qovery-cli/default.nix b/pkgs/tools/admin/qovery-cli/default.nix index 265f7f9de069e..2abc5b8510397 100644 --- a/pkgs/tools/admin/qovery-cli/default.nix +++ b/pkgs/tools/admin/qovery-cli/default.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "qovery-cli"; - version = "0.92.3"; + version = "0.92.4"; src = fetchFromGitHub { owner = "Qovery"; repo = "qovery-cli"; rev = "refs/tags/v${version}"; - hash = "sha256-Xcl/2vkuOYfZcgICThYD5i1h82E6Leh+hNPzmzISZvQ="; + hash = "sha256-A8R1QbUFD4wJyLrTrxE8w9rz0E/vhaPXXAt80UpAOSc="; }; vendorHash = "sha256-6gjYnDv4L2AO47uWcp/MySX9i3IDMIWQUvgglxPCvGo="; diff --git a/pkgs/tools/backup/duplicity/default.nix b/pkgs/tools/backup/duplicity/default.nix index 1da3131f85b04..fd5c7c60f0c9e 100644 --- a/pkgs/tools/backup/duplicity/default.nix +++ b/pkgs/tools/backup/duplicity/default.nix @@ -3,6 +3,7 @@ , fetchFromGitLab , python3 , librsync +, glib , ncftp , gnupg , gnutar @@ -10,6 +11,7 @@ , util-linux , rsync , makeWrapper +, wrapGAppsNoGuiHook , gettext , getconf , testers @@ -57,11 +59,14 @@ let self = python3.pkgs.buildPythonApplication rec { makeWrapper gettext python3.pkgs.wrapPython + wrapGAppsNoGuiHook python3.pkgs.setuptools-scm ]; buildInputs = [ librsync + # For Gio typelib + glib ]; pythonPath = with python3.pkgs; [ @@ -99,7 +104,10 @@ let self = python3.pkgs.buildPythonApplication rec { fasteners ]); - postInstall = let + # Prevent double wrapping, let the Python wrapper use the args in preFixup. + dontWrapGApps = true; + + preFixup = let binPath = lib.makeBinPath ([ gnupg ncftp @@ -107,8 +115,16 @@ let self = python3.pkgs.buildPythonApplication rec { ] ++ lib.optionals stdenv.isDarwin [ getconf ]); in '' - wrapProgram $out/bin/duplicity \ + makeWrapperArgsBak=("''${makeWrapperArgs[@]}") + makeWrapperArgs+=( + "''${gappsWrapperArgs[@]}" --prefix PATH : "${binPath}" + ) + ''; + + postFixup = '' + # Restore previous value for tests wrapping in preInstallCheck + makeWrapperArgs=("''${makeWrapperArgsBak[@]}") ''; preCheck = '' diff --git a/pkgs/tools/filesystems/bcachefs-tools/default.nix b/pkgs/tools/filesystems/bcachefs-tools/default.nix index 4170271f4a796..ec268aac31185 100644 --- a/pkgs/tools/filesystems/bcachefs-tools/default.nix +++ b/pkgs/tools/filesystems/bcachefs-tools/default.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + fetchpatch, pkg-config, libuuid, libsodium, @@ -72,6 +73,15 @@ stdenv.mkDerivation (finalAttrs: { # FIXME: Try enabling this once the default linux kernel is at least 6.7 doCheck = false; # needs bcachefs module loaded on builder + patches = [ + # code refactoring of bcachefs-tools broke reading passphrases from stdin (vs. terminal) + # upstream issue https://github.com/koverstreet/bcachefs-tools/issues/261 + (fetchpatch { + url = "https://github.com/koverstreet/bcachefs-tools/commit/38b0cb721d2a35f5a4af429bc7bd367461f2fa26.patch"; + hash = "sha256-/9reye+Qoa+EMkS+wfdX+KwDeLHHJ/S+Qm7sWl0MtqM="; + }) +]; + preCheck = lib.optionalString (!fuseSupport) '' rm tests/test_fuse.py ''; diff --git a/pkgs/tools/filesystems/s3backer/default.nix b/pkgs/tools/filesystems/s3backer/default.nix index 3585408a2f7d0..b44ee42305d0f 100644 --- a/pkgs/tools/filesystems/s3backer/default.nix +++ b/pkgs/tools/filesystems/s3backer/default.nix @@ -4,10 +4,10 @@ stdenv.mkDerivation rec { pname = "s3backer"; - version = "2.0.2"; + version = "2.1.2"; src = fetchFromGitHub { - sha256 = "sha256-xmOtL4v3UxdjrL09sSfXyF5FoMrNerSqG9nvEuwMvNM="; + sha256 = "sha256-/WdY++rrcQ3N+4ROeaA113Iq1nMGxOp3LzsCaLsxaaM="; rev = version; repo = "s3backer"; owner = "archiecobbs"; diff --git a/pkgs/tools/games/pokefinder/default.nix b/pkgs/tools/games/pokefinder/default.nix index de53fb839af9a..3ca5520fda15a 100644 --- a/pkgs/tools/games/pokefinder/default.nix +++ b/pkgs/tools/games/pokefinder/default.nix @@ -4,6 +4,7 @@ , makeDesktopItem , fetchFromGitHub , cmake +, python3 , qtbase , qttools , qtwayland @@ -43,7 +44,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - nativeBuildInputs = [ cmake wrapQtAppsHook ] ++ lib.optionals (!stdenv.isDarwin) [ copyDesktopItems imagemagick ]; + nativeBuildInputs = [ cmake wrapQtAppsHook python3 ] ++ lib.optionals (!stdenv.isDarwin) [ copyDesktopItems imagemagick ]; desktopItems = [ (makeDesktopItem { diff --git a/pkgs/tools/graphics/realesrgan-ncnn-vulkan/cmakelists.patch b/pkgs/tools/graphics/realesrgan-ncnn-vulkan/cmakelists.patch index 19453e8912a9b..bf51aec6367ea 100644 --- a/pkgs/tools/graphics/realesrgan-ncnn-vulkan/cmakelists.patch +++ b/pkgs/tools/graphics/realesrgan-ncnn-vulkan/cmakelists.patch @@ -1,15 +1,27 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 1e7b71a..e743ab0 100644 +index 1e7b71a..2ac2826 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -106,9 +106,9 @@ if(USE_SYSTEM_NCNN) +@@ -106,20 +106,13 @@ if(USE_SYSTEM_NCNN) message(STATUS "Using glslang install located at ${GLSLANG_TARGET_DIR}") - + find_package(Threads) ++ find_package(glslang REQUIRED) + find_package(SPIRV-Tools-opt REQUIRED) - - include("${GLSLANG_TARGET_DIR}/OSDependentTargets.cmake") + +- include("${GLSLANG_TARGET_DIR}/OSDependentTargets.cmake") - include("${GLSLANG_TARGET_DIR}/OGLCompilerTargets.cmake") if(EXISTS "${GLSLANG_TARGET_DIR}/HLSLTargets.cmake") # hlsl support can be optional include("${GLSLANG_TARGET_DIR}/HLSLTargets.cmake") + endif() +- include("${GLSLANG_TARGET_DIR}/glslangTargets.cmake") +- include("${GLSLANG_TARGET_DIR}/SPIRVTargets.cmake") +- +- if (NOT TARGET glslang OR NOT TARGET SPIRV) +- message(WARNING "glslang or SPIRV target not found! USE_SYSTEM_NCNN will be turned off.") +- set(USE_SYSTEM_NCNN OFF) +- endif() + endif() + endif() + diff --git a/pkgs/tools/graphics/realesrgan-ncnn-vulkan/default.nix b/pkgs/tools/graphics/realesrgan-ncnn-vulkan/default.nix index c7f9817326b8a..59c2753011d31 100644 --- a/pkgs/tools/graphics/realesrgan-ncnn-vulkan/default.nix +++ b/pkgs/tools/graphics/realesrgan-ncnn-vulkan/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { cp -r ${models}/models $out/share ''; - postFixup = '' + postFixup = lib.optionalString stdenv.isLinux '' patchelf $out/bin/realesrgan-ncnn-vulkan --add-needed libvulkan.so ''; diff --git a/pkgs/tools/misc/gh-markdown-preview/default.nix b/pkgs/tools/misc/gh-markdown-preview/default.nix index 68f041dbbf2d4..573cd607be419 100644 --- a/pkgs/tools/misc/gh-markdown-preview/default.nix +++ b/pkgs/tools/misc/gh-markdown-preview/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "gh-markdown-preview"; - version = "1.4.2"; + version = "1.5.0"; src = fetchFromGitHub { owner = "yusukebe"; repo = "gh-markdown-preview"; rev = "v${version}"; - hash = "sha256-UBveXL4/3GxxIVjqG0GuTbkGkzXFc/stew2s+dTj9BI="; + hash = "sha256-gi6Wza8v4V8PAHO75UycP0CEzvXEtm22hTEWs/dJ+LQ="; }; vendorHash = "sha256-O6Q9h5zcYAoKLjuzGu7f7UZY0Y5rL2INqFyJT2QZJ/E="; diff --git a/pkgs/tools/misc/goose/default.nix b/pkgs/tools/misc/goose/default.nix index dcb6acec4d9e3..994aa5df6ec5f 100644 --- a/pkgs/tools/misc/goose/default.nix +++ b/pkgs/tools/misc/goose/default.nix @@ -6,29 +6,31 @@ buildGoModule rec { pname = "goose"; - version = "3.19.2"; + version = "3.20.0"; src = fetchFromGitHub { owner = "pressly"; repo = pname; rev = "v${version}"; - hash = "sha256-kGa3vZSFQ8Dgndc0qRnFnQwlU2hst6j3UFUXw+tfYR0="; + hash = "sha256-DgxFczS2YAnicf8RTMf7gDzCtDyj/zqzrGfeb3YcYzg="; }; proxyVendor = true; - vendorHash = "sha256-aoBxReKRk7dkFR/fJ5uHDZrJRGutLTU2BhDWCTBN2BA="; + vendorHash = "sha256-KzIOylWrsOF5oAuuFKUKVSnSJWq3KWZ3Ot7sryNnjIY="; # skipping: end-to-end tests require a docker daemon postPatch = '' - rm -r tests/e2e rm -r tests/gomigrations - rm -r tests/vertica ''; + subPackages = [ + "cmd/goose" + ]; + ldflags = [ "-s" "-w" - "-X=main.gooseVersion=${version}" + "-X=main.version=${version}" ]; checkFlags = [ diff --git a/pkgs/tools/misc/hueadm/default.nix b/pkgs/tools/misc/hueadm/default.nix index 6afa6607129fb..30cbaa591cc56 100644 --- a/pkgs/tools/misc/hueadm/default.nix +++ b/pkgs/tools/misc/hueadm/default.nix @@ -22,7 +22,7 @@ buildNpmPackage rec { description = "Command line management interface to Philips Hue"; homepage = "https://github.com/bahamas10/hueadm"; license = lib.licenses.mit; - maintainers = [ ]; + maintainers = with lib.maintainers; [ sigmanificient ]; mainProgram = "hueadm"; }; } diff --git a/pkgs/tools/misc/ipxe/default.nix b/pkgs/tools/misc/ipxe/default.nix index ebcd89bd6bd79..7ad4b0d809f11 100644 --- a/pkgs/tools/misc/ipxe/default.nix +++ b/pkgs/tools/misc/ipxe/default.nix @@ -33,7 +33,7 @@ in stdenv.mkDerivation rec { pname = "ipxe"; - version = "1.21.1-unstable-2024-02-08"; + version = "1.21.1-unstable-2024-04-17"; nativeBuildInputs = [ gnu-efi mtools openssl perl xorriso xz ] ++ lib.optional stdenv.hostPlatform.isx86 syslinux; depsBuildBuild = [ buildPackages.stdenv.cc ]; @@ -43,8 +43,8 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "ipxe"; repo = "ipxe"; - rev = "a846c4ccfc7db212dff792e081991df17268b4d5"; - hash = "sha256-4BvAwZ09EZJXBkdkZHLw0qjOqasNaN6RF4wmTfPVTWc="; + rev = "d7e58c5a812988c341ec4ad19f79faf067388d58"; + hash = "sha256-OIisRd2o2zrTqH1Xv3FDhQWDqhKNeGhPkHWyYZzbtTU="; }; postPatch = lib.optionalString stdenv.hostPlatform.isAarch64 '' diff --git a/pkgs/tools/misc/mongodb-compass/default.nix b/pkgs/tools/misc/mongodb-compass/default.nix index 6df35c2ea734f..c89018cf03a45 100644 --- a/pkgs/tools/misc/mongodb-compass/default.nix +++ b/pkgs/tools/misc/mongodb-compass/default.nix @@ -33,7 +33,7 @@ xorg, }: let - version = "1.42.5"; + version = "1.43.0"; rpath = lib.makeLibraryPath [ alsa-lib @@ -82,7 +82,7 @@ let if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { url = "https://downloads.mongodb.com/compass/mongodb-compass_${version}_amd64.deb"; - sha256 = "sha256-46JQXC2Ydq37TomtQdnvk8DwSs8aCfozxqUaEO6hmxo="; + sha256 = "sha256-hzPhF0NGwv+Lm+q5SoS8qv10UmuKf4RarGMkEeCxp9w="; } else throw "MongoDB compass is not supported on ${stdenv.hostPlatform.system}"; diff --git a/pkgs/tools/misc/panoply/default.nix b/pkgs/tools/misc/panoply/default.nix index b79d6b7d8e35d..b5df3adc7b3d4 100644 --- a/pkgs/tools/misc/panoply/default.nix +++ b/pkgs/tools/misc/panoply/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "panoply"; - version = "5.3.4"; + version = "5.4.0"; src = fetchurl { url = "https://www.giss.nasa.gov/tools/panoply/download/PanoplyJ-${version}.tgz"; - sha256 = "sha256-v7ieTtm2W8Sc/zhQ7QPh8rkMUgaqgfGYYXc6Ly+9iMg="; + sha256 = "sha256-mWk0wuTxkITVU3SwWYPHrX8Y9NceXeRMwyvpwEDWIiA="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/misc/topicctl/default.nix b/pkgs/tools/misc/topicctl/default.nix index 86debbf388007..c3252987c4ce3 100644 --- a/pkgs/tools/misc/topicctl/default.nix +++ b/pkgs/tools/misc/topicctl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "topicctl"; - version = "1.16.1"; + version = "1.17.0"; src = fetchFromGitHub { owner = "segmentio"; repo = "topicctl"; rev = "v${version}"; - sha256 = "sha256-Gx/ld651Se2mLlUG/CkHawfVBN2BsxV8w6vrnKFLHuE="; + sha256 = "sha256-S1i2Nv7FQzqCTTjkS5slEI0vdt3kXhVWdtaYyng1GsQ="; }; vendorHash = "sha256-+mnnvdna1g6JE29weOJZmdO3jFp2a75dV9wK2XcWJ9s="; diff --git a/pkgs/tools/misc/uucp/default.nix b/pkgs/tools/misc/uucp/default.nix index 28f7a6572c185..325ad135558c3 100644 --- a/pkgs/tools/misc/uucp/default.nix +++ b/pkgs/tools/misc/uucp/default.nix @@ -1,11 +1,11 @@ -{ lib, stdenv, fetchurl }: +{ lib, stdenv, fetchurl, autoreconfHook, testers }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "uucp"; version = "1.07"; src = fetchurl { - url = "mirror://gnu/uucp/uucp-${version}.tar.gz"; + url = "mirror://gnu/uucp/uucp-${finalAttrs.version}.tar.gz"; sha256 = "0b5nhl9vvif1w3wdipjsk8ckw49jj1w85xw1mmqi3zbcpazia306"; }; @@ -13,15 +13,28 @@ stdenv.mkDerivation rec { prePatch = '' # do not set sticky bit in nix store - substituteInPlace Makefile.in \ - --replace 4555 0555 - sed -i '/chown $(OWNER)/d' Makefile.in + substituteInPlace Makefile.am \ + --replace-fail 4555 0555 + sed -i '/chown $(OWNER)/d' Makefile.am + + # don't reply on implicitly defined `exit` function in `HAVE_VOID` test: + substituteInPlace configure.in \ + --replace-fail '(void) exit (0)' '(void) (0)' ''; + # Regenerate `configure`; the checked in version was generated in 2002 and + # contains snippets like `main(){return(0);}` that modern compilers dislike. + nativeBuildInputs = [ autoreconfHook ]; + makeFlags = [ "AR:=$(AR)" ]; + passthru.tests.version = testers.testVersion { + package = finalAttrs.finalPackage; + }; + meta = { description = "Unix-unix cp over serial line, also includes cu program"; + mainProgram = "uucp"; longDescription = '' Taylor UUCP is a free implementation of UUCP and is the standard @@ -37,4 +50,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; maintainers = [ ]; }; -} +}) diff --git a/pkgs/tools/misc/wootility/default.nix b/pkgs/tools/misc/wootility/default.nix index 803ad53038e7a..f8590702ecb95 100644 --- a/pkgs/tools/misc/wootility/default.nix +++ b/pkgs/tools/misc/wootility/default.nix @@ -8,11 +8,11 @@ appimageTools.wrapType2 rec { pname = "wootility"; - version = "4.6.15"; + version = "4.6.18"; src = fetchurl { url = "https://s3.eu-west-2.amazonaws.com/wooting-update/wootility-lekker-linux-latest/wootility-lekker-${version}.AppImage"; - sha256 = "sha256-A/cjm9rhcgp68hbyjy7OfYPBKBcccl0OdD7MTdpEdPM="; + sha256 = "sha256-oiPt1xgmYGYO1dk01rDwwaUf+yhDAbRCqTTuOivR/kI="; }; profile = '' diff --git a/pkgs/tools/networking/brook/default.nix b/pkgs/tools/networking/brook/default.nix index 77a70381b1d99..943ccbc9798ab 100644 --- a/pkgs/tools/networking/brook/default.nix +++ b/pkgs/tools/networking/brook/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "brook"; - version = "20240404"; + version = "20240606"; src = fetchFromGitHub { owner = "txthinking"; repo = pname; rev = "v${version}"; - sha256 = "sha256-QqA0LnbC72bnAQ25AehTnoXgdqQPc8wztHcFd4Q19ko="; + sha256 = "sha256-rfCqYI0T/nbK+rlPGl5orLo3qHKITesdFNtXc/ECATA="; }; - vendorHash = "sha256-1aaOPeKHPrZO6WK08EhX4+dME0A33raQnbZi/aNFpIw="; + vendorHash = "sha256-dYiifLUOq6RKAVSXuoGlok9Jp8jHmbXN/EjQeQpoqWw="; meta = with lib; { homepage = "https://github.com/txthinking/brook"; diff --git a/pkgs/tools/networking/ferm/default.nix b/pkgs/tools/networking/ferm/default.nix index 63f247ab986b3..e14b3f8572b83 100644 --- a/pkgs/tools/networking/ferm/default.nix +++ b/pkgs/tools/networking/ferm/default.nix @@ -11,6 +11,10 @@ in stdenv.mkDerivation rec { sha256 = "sha256-wA2RDVOU5pZ1YI617g9QTVz9pB6ZCi2akbqsbfk+P5I="; }; + patches = [ + ./import-ferm-wrapped.patch + ]; + # perl is used at build time to gather the ferm version. nativeBuildInputs = [ makeWrapper perl ]; buildInputs = [ perl ]; diff --git a/pkgs/tools/networking/ferm/import-ferm-wrapped.patch b/pkgs/tools/networking/ferm/import-ferm-wrapped.patch new file mode 100644 index 0000000000000..3975c79af8868 --- /dev/null +++ b/pkgs/tools/networking/ferm/import-ferm-wrapped.patch @@ -0,0 +1,14 @@ +--- old/src/import-ferm ++++ new/src/import-ferm +@@ -42,9 +42,9 @@ + # find the main "ferm" program + my $ferm; + if ($0 =~ /^(.*)\//) { +- $ferm = "$1/ferm"; ++ $ferm = "$1/.ferm-wrapped"; + } else { +- $ferm = 'ferm'; ++ $ferm = '.ferm-wrapped'; + } + + # Perl 5.24 requires this prefix or else it will only look in @INC diff --git a/pkgs/tools/networking/linkchecker/default.nix b/pkgs/tools/networking/linkchecker/default.nix index 2adf2c8f82d10..dad2af76964fd 100644 --- a/pkgs/tools/networking/linkchecker/default.nix +++ b/pkgs/tools/networking/linkchecker/default.nix @@ -1,5 +1,4 @@ { lib -, stdenv , fetchFromGitHub , python3 , gettext @@ -8,50 +7,49 @@ python3.pkgs.buildPythonApplication rec { pname = "linkchecker"; version = "10.2.1"; - format = "pyproject"; + pyproject = true; src = fetchFromGitHub { - owner = pname; - repo = pname; + owner = "linkchecker"; + repo = "linkchecker"; rev = "refs/tags/v${version}"; hash = "sha256-z7Qp74cai8GfsxB4n9dSCWQepp0/4PimFiRJQBaVSoo="; }; - nativeBuildInputs = [ - gettext + nativeBuildInputs = [ gettext ]; + + build-system = with python3.pkgs; [ + hatchling + hatch-vcs + polib # translations ]; - propagatedBuildInputs = with python3.pkgs; [ + dependencies = with python3.pkgs; [ argcomplete beautifulsoup4 - configargparse dnspython - hatch-vcs - hatchling - pyopenssl requests ]; nativeCheckInputs = with python3.pkgs; [ + pyopenssl parameterized pytestCheckHook ]; disabledTests = [ - # test_timeit2 is flakey, and depends sleep being precise to the milisecond "TestLoginUrl" - "test_timeit2" + "test_timeit2" # flakey, and depends sleep being precise to the milisecond + "test_internet" # uses network, fails on Darwin (not sure why it doesn't fail on linux) ]; disabledTestPaths = [ "tests/checker/telnetserver.py" "tests/checker/test_telnet.py" - ] ++ lib.optionals stdenv.isDarwin [ - "tests/checker/test_content_allows_robots.py" - "tests/checker/test_http*.py" - "tests/test_network.py" ]; + __darwinAllowLocalNetworking = true; + meta = with lib; { description = "Check websites for broken links"; mainProgram = "linkchecker"; diff --git a/pkgs/tools/networking/lychee/default.nix b/pkgs/tools/networking/lychee/default.nix index d141217591509..610869897b7b8 100644 --- a/pkgs/tools/networking/lychee/default.nix +++ b/pkgs/tools/networking/lychee/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "lychee"; - version = "0.15.0"; + version = "0.15.1"; src = fetchFromGitHub { owner = "lycheeverse"; repo = pname; rev = "v${version}"; - hash = "sha256-luc6rzNYhS+c5B4S3/cOvDqnRF+LfRDY1aw99hkF+nE="; + hash = "sha256-L1tvP2lZsFD2swhP1MetQFxxxA+EbrI4aDYTJwbpkVI="; }; - cargoHash = "sha256-kGdRz5m0L3v3DBeabYq1Zp0bEEPW5C0y+A7tTjWkCwM="; + cargoHash = "sha256-SQ9Dgtg3TKAaj9XkpEzA13U8CumGOlpwiW+Lv6leQW4="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/tools/networking/netbird/default.nix b/pkgs/tools/networking/netbird/default.nix index d8f0661f7d0db..f946bdca45b3e 100644 --- a/pkgs/tools/networking/netbird/default.nix +++ b/pkgs/tools/networking/netbird/default.nix @@ -31,13 +31,13 @@ let in buildGoModule rec { pname = "netbird"; - version = "0.27.4"; + version = "0.27.5"; src = fetchFromGitHub { owner = "netbirdio"; repo = pname; rev = "v${version}"; - hash = "sha256-+IcgzwLUA8OIa9od5LkGnI05FTbxC8PmOf8s5+akTrk="; + hash = "sha256-DWtTCx+vzOE4yE9jAUxB1oF1UubIXK4f7wptJY89az0="; }; vendorHash = "sha256-LPq6ovulE+xdoRaQpwA0mNqw3kFxMs/am1ucO8UmDtU="; diff --git a/pkgs/tools/networking/networkd-dispatcher/default.nix b/pkgs/tools/networking/networkd-dispatcher/default.nix index a2a03d1f84049..3caadb67caf38 100644 --- a/pkgs/tools/networking/networkd-dispatcher/default.nix +++ b/pkgs/tools/networking/networkd-dispatcher/default.nix @@ -4,7 +4,7 @@ , fetchpatch , python3Packages , asciidoc -, makeWrapper +, wrapGAppsNoGuiHook , iw }: @@ -43,10 +43,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ asciidoc - makeWrapper + wrapGAppsNoGuiHook python3Packages.wrapPython ]; + dontWrapGApps = true; + checkInputs = with python3Packages; [ dbus-python iw @@ -72,9 +74,14 @@ stdenv.mkDerivation rec { doCheck = true; + preFixup = '' + makeWrapperArgs+=( \ + "''${gappsWrapperArgs[@]}" \ + --prefix PATH : "${lib.makeBinPath [ iw ]}" \ + ) + ''; postFixup = '' wrapPythonPrograms - wrapProgram $out/bin/networkd-dispatcher --prefix PATH : ${lib.makeBinPath [ iw ]} ''; meta = with lib; { diff --git a/pkgs/tools/networking/zap/default.nix b/pkgs/tools/networking/zap/default.nix index 9bb63cf37e7cb..e0ceade91f5ad 100644 --- a/pkgs/tools/networking/zap/default.nix +++ b/pkgs/tools/networking/zap/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "zap"; - version = "2.14.0"; + version = "2.15.0"; src = fetchurl { url = "https://github.com/zaproxy/zaproxy/releases/download/v${version}/ZAP_${version}_Linux.tar.gz"; - sha256 = "sha256-IZ1/JbviUkdxOAWrAswSJ5iYyHB0PBquPCsLGIIZGWA="; + sha256 = "sha256-ZBDhlrqrRYqSBOKar7V0X8oAOipsA4byxuXAS2diH6c="; }; buildInputs = [ jre ]; @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "https://www.owasp.org/index.php/ZAP"; + homepage = "https://www.zaproxy.org/"; description = "Java application for web penetration testing"; maintainers = with maintainers; [ mog rafael ]; platforms = platforms.linux; diff --git a/pkgs/tools/networking/zerotierone/Cargo.lock b/pkgs/tools/networking/zerotierone/Cargo.lock index b01e68e2d084e..1b01a0df3e128 100644 --- a/pkgs/tools/networking/zerotierone/Cargo.lock +++ b/pkgs/tools/networking/zerotierone/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", ] @@ -18,6 +18,33 @@ 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 = "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 = "android-tzdata" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -42,6 +69,51 @@ dependencies = [ ] [[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.81" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0952808a6c2afd1aa8947271f3a60f1a6763c7b912d210184c5149b5cf147247" + +[[package]] +name = "async-stream" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd56dd203fef61ac097dd65721a419ddccb106b2d2b70ba60a6b529f03961a51" +dependencies = [ + "async-stream-impl", + "futures-core", + "pin-project-lite", +] + +[[package]] +name = "async-stream-impl" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.53", +] + +[[package]] +name = "async-trait" +version = "0.1.78" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "461abc97219de0eaaf81fe3ef974a540158f3d079c2ab200f891f1a2ef201e85" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.53", +] + +[[package]] name = "atty" version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -59,10 +131,66 @@ 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", + "bitflags 1.3.2", + "bytes", + "futures-util", + "http", + "http-body", + "hyper", + "itoa", + "matchit", + "memchr", + "mime", + "percent-encoding", + "pin-project-lite", + "rustversion", + "serde", + "sync_wrapper", + "tower", + "tower-layer", + "tower-service", +] + +[[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", +] + +[[package]] +name = "backoff" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b62ddb9cb1ec0a098ad4bbf9344d0713fa193ae1a80af55febcff2627b6a00c1" +dependencies = [ + "getrandom", + "instant", + "rand", +] + +[[package]] name = "backtrace" -version = "0.3.68" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4319208da049c43661739c5fade2ba182f09d1dc2299b32298d3a31692b17e12" +checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" dependencies = [ "addr2line", "cc", @@ -74,6 +202,12 @@ dependencies = [ ] [[package]] +name = "base16ct" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf" + +[[package]] name = "base64" version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -81,9 +215,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 = "base64ct" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" [[package]] name = "bitflags" @@ -93,9 +233,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" [[package]] name = "block-buffer" @@ -108,15 +248,21 @@ dependencies = [ [[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.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" +checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" [[package]] name = "cbindgen" @@ -125,8 +271,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "51e3973b165dc0f435831a9e426de67e894de532754ff7a3f307c03ee5dec7dc" dependencies = [ "clap", - "heck", - "indexmap", + "heck 0.3.3", + "indexmap 1.9.3", "log", "proc-macro2", "quote", @@ -139,12 +285,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.82" +version = "1.0.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "305fe645edc1442a0fa8b6726ba61d422798d37a52e12eaecf4b022ebbb88f01" -dependencies = [ - "libc", -] +checksum = "8cd6604a82acf3039f1144f54b8eb34e91ffba622051189e71b781822d5ee1f5" [[package]] name = "cfg-if" @@ -154,15 +297,17 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.26" +version = "0.4.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5" +checksum = "8eaf5903dcbc0a39312feb77df2ff4c76387d591b9fc7b04a238dcf8bb62639a" dependencies = [ "android-tzdata", "iana-time-zone", + "js-sys", "num-traits", "serde", - "winapi", + "wasm-bindgen", + "windows-targets 0.52.4", ] [[package]] @@ -181,10 +326,22 @@ dependencies = [ ] [[package]] +name = "const-oid" +version = "0.9.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" + +[[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" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" +checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" dependencies = [ "core-foundation-sys", "libc", @@ -192,20 +349,56 @@ 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", ] [[package]] +name = "crossbeam-channel" +version = "0.5.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab3db02a9c5b5121e1e42fbdb1aeb65f5e02624cc58c43f2884c6ccac0b82f95" +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" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" + +[[package]] +name = "crypto-bigint" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0dc92fb57ca44df6db8059111ab3af99a63d5d0f8375d9972e319a379c6bab76" +dependencies = [ + "generic-array", + "rand_core", + "subtle", + "zeroize", +] + +[[package]] name = "crypto-common" version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -216,10 +409,38 @@ dependencies = [ ] [[package]] +name = "curve25519-dalek" +version = "4.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a677b8922c94e01bdbb12126b0bc852f00447528dee1782229af9c720c3f348" +dependencies = [ + "cfg-if", + "cpufeatures", + "curve25519-dalek-derive", + "digest", + "fiat-crypto", + "platforms", + "rustc_version", + "subtle", + "zeroize", +] + +[[package]] +name = "curve25519-dalek-derive" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.53", +] + +[[package]] name = "darling" -version = "0.13.4" +version = "0.20.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a01d95850c592940db9b8194bc39f4bc0e89dee5c4265e4b1807c34a9aba453c" +checksum = "54e36fcd13ed84ffdfda6f5be89b31287cbb80c439841fe69e04841435464391" dependencies = [ "darling_core", "darling_macro", @@ -227,34 +448,106 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.13.4" +version = "0.20.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "859d65a907b6852c9361e3185c862aae7fafd2887876799fa55f5f99dc40d610" +checksum = "9c2cf1c23a687a1feeb728783b993c4e1ad83d99f351801977dd809b48d0a70f" dependencies = [ "fnv", "ident_case", "proc-macro2", "quote", "strsim 0.10.0", - "syn 1.0.109", + "syn 2.0.53", ] [[package]] name = "darling_macro" -version = "0.13.4" +version = "0.20.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c972679f83bdf9c42bd905396b6c3588a843a17f0f16dfcfa3e2c5d57441835" +checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f" dependencies = [ "darling_core", "quote", - "syn 1.0.109", + "syn 2.0.53", +] + +[[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 = "der" +version = "0.7.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fffa369a668c8af7dbf8b5e56c9f744fbd399949ed171606040001947de40b1c" +dependencies = [ + "const-oid", + "pem-rfc7468", + "zeroize", ] [[package]] name = "deranged" -version = "0.3.7" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7684a49fb1af197853ef7b2ee694bc1f5b4179556f1e5710e1760c5db6f5e929" +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" +dependencies = [ + "powerfmt", + "serde", +] + +[[package]] +name = "derive_builder" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0350b5cb0331628a5916d6c5c0b72e97393b8b6b03b47a9284f4e7f5a405ffd7" +dependencies = [ + "derive_builder_macro", +] + +[[package]] +name = "derive_builder_core" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d48cda787f839151732d396ac69e3473923d54312c070ee21e9effcaa8ca0b1d" +dependencies = [ + "darling", + "proc-macro2", + "quote", + "syn 2.0.53", +] + +[[package]] +name = "derive_builder_macro" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "206868b8242f27cecce124c19fd88157fbd0dd334df2587f36417bafbc85097b" +dependencies = [ + "derive_builder_core", + "syn 2.0.53", +] + +[[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 = "digest" @@ -263,51 +556,181 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" dependencies = [ "block-buffer", + "const-oid", "crypto-common", "subtle", ] [[package]] +name = "downcast" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1435fa1053d8b2fbbe9be7e97eca7f33d37b28409959813daefc1446a14247f1" + +[[package]] +name = "dyn-clone" +version = "1.0.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d6ef0072f8a535281e4876be788938b528e9a1d43900b82c2569af7da799125" + +[[package]] +name = "ecdsa" +version = "0.16.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee27f32b5c5292967d2d4a9d7f1e0b0aed2c15daded5a60300e4abb9d8020bca" +dependencies = [ + "der", + "digest", + "elliptic-curve", + "rfc6979", + "signature", + "spki", +] + +[[package]] +name = "ed25519" +version = "2.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "115531babc129696a58c64a4fef0a8bf9e9698629fb97e9e40767d235cfbcd53" +dependencies = [ + "pkcs8", + "signature", +] + +[[package]] +name = "ed25519-dalek" +version = "2.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a3daa8e81a3963a60642bcc1f90a670680bd4a77535faa384e9d1c79d620871" +dependencies = [ + "curve25519-dalek", + "ed25519", + "serde", + "sha2", + "subtle", + "zeroize", +] + +[[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.13.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5e6043086bf7973472e0c7dff2142ea0b680d30e18d9cc40f267efbf222bd47" +dependencies = [ + "base16ct", + "crypto-bigint", + "digest", + "ff", + "generic-array", + "group", + "hkdf", + "pem-rfc7468", + "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", ] [[package]] -name = "errno" -version = "0.3.2" +name = "enum-iterator" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b30f669a7961ef1631673d2766cc92f52d64f7ef354d4fe0ddfd30ed52f0f4f" +checksum = "600536cfe9e2da0820aa498e570f6b2b9223eec3ce2f835c8ae4861304fa4794" dependencies = [ - "errno-dragonfly", - "libc", - "windows-sys", + "enum-iterator-derive", ] [[package]] -name = "errno-dragonfly" -version = "0.1.2" +name = "enum-iterator-derive" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" +checksum = "03cdc46ec28bd728e67540c528013c6a10eb69a02eb31078a1bda695438cbfb8" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.53", +] + +[[package]] +name = "enum_dispatch" +version = "0.3.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f33313078bb8d4d05a2733a94ac4c2d8a0df9a2b84424ebf4f33bfc224a890e" +dependencies = [ + "once_cell", + "proc-macro2", + "quote", + "syn 2.0.53", +] + +[[package]] +name = "equivalent" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + +[[package]] +name = "erased-serde" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b73807008a3c7f171cc40312f37d95ef0396e048b5848d775f54b1a4dd4a0d3" +dependencies = [ + "serde", +] + +[[package]] +name = "errno" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" dependencies = [ - "cc", "libc", + "windows-sys 0.52.0", ] [[package]] name = "fastrand" -version = "2.0.0" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" + +[[package]] +name = "ff" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ded41244b729663b1e574f1b4fb731469f69f79c17667b5d776b16cda0479449" +dependencies = [ + "rand_core", + "subtle", +] + +[[package]] +name = "fiat-crypto" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764" +checksum = "1676f435fc1dadde4d03e43f5d62b259e1ce5f40bd4ffb21db2b42ebe59c1382" + +[[package]] +name = "fixedbitset" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" [[package]] name = "fnv" @@ -332,54 +755,118 @@ 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 = "fragile" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa" + +[[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.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" +checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" dependencies = [ "futures-core", + "futures-sink", ] [[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.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.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.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.53", +] + +[[package]] +name = "futures-retry" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fde5a672a61f96552aa5ed9fd9c81c3fbdae4be9b1e205d6eaf17c83705adc0f" +dependencies = [ + "futures", + "pin-project-lite", + "tokio", +] [[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 = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" + +[[package]] +name = "futures-timer" +version = "3.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" +checksum = "f288b0a4f20f9a56b5d1da57e2227c661b7b16168e2f72365f57b63326e29b24" [[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", "futures-io", + "futures-macro", + "futures-sink", "futures-task", "memchr", "pin-project-lite", @@ -395,13 +882,14 @@ checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" dependencies = [ "typenum", "version_check", + "zeroize", ] [[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", "js-sys", @@ -412,15 +900,46 @@ 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 = "governor" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68a7f542ee6b35af73b06abc0dad1c1bae89964e4e253bc4b587b91c9637867b" +dependencies = [ + "cfg-if", + "dashmap", + "futures", + "futures-timer", + "no-std-compat", + "nonzero_ext", + "parking_lot", + "portable-atomic", + "quanta", + "rand", + "smallvec", + "spinning_top", +] + +[[package]] +name = "group" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63" +dependencies = [ + "ff", + "rand_core", + "subtle", +] [[package]] name = "h2" -version = "0.3.20" +version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97ec8491ebaf99c8eaa73058b045fe58073cd6be7f596ac993ced0b0a0c01049" +checksum = "4fbd2820c5e49886948654ab546d0688ff24530286bdcf8fca3cefb16d4618eb" dependencies = [ "bytes", "fnv", @@ -428,7 +947,7 @@ dependencies = [ "futures-sink", "futures-util", "http", - "indexmap", + "indexmap 2.2.5", "slab", "tokio", "tokio-util", @@ -442,6 +961,16 @@ 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" +dependencies = [ + "ahash", + "allocator-api2", +] + +[[package]] name = "heck" version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -451,6 +980,12 @@ dependencies = [ ] [[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.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -461,9 +996,24 @@ dependencies = [ [[package]] name = "hermit-abi" -version = "0.3.2" +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 = "hkdf" +version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" +checksum = "7b5f8eb2ad728638ea2c7d47a21db23b7b58a72ed6a38256b8a1849f15fbbdf7" +dependencies = [ + "hmac", +] [[package]] name = "hmac" @@ -475,10 +1025,19 @@ dependencies = [ ] [[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 = "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", @@ -487,9 +1046,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", @@ -510,9 +1069,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", @@ -525,7 +1084,7 @@ dependencies = [ "httpdate", "itoa", "pin-project-lite", - "socket2 0.4.9", + "socket2", "tokio", "tower-service", "tracing", @@ -533,6 +1092,18 @@ dependencies = [ ] [[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 = "hyper-tls" version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -547,16 +1118,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]] @@ -576,9 +1147,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", @@ -591,14 +1162,41 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" dependencies = [ "autocfg", - "hashbrown", + "hashbrown 0.12.3", + "serde", +] + +[[package]] +name = "indexmap" +version = "2.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b0b929d511467233429c45a44ac1dcaa21ba0f5ba11e4879e6ed28ddb4f9df4" +dependencies = [ + "equivalent", + "hashbrown 0.14.3", + "serde", ] [[package]] +name = "instant" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "inventory" +version = "0.3.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f958d3d68f4167080a18141e10381e7634563984a537f2a49a30fd8e53ac5767" + +[[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 = "itertools" @@ -610,16 +1208,34 @@ dependencies = [ ] [[package]] +name = "itertools" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" +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.9" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" +checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" [[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", ] @@ -643,30 +1259,73 @@ 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 = "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 = "libm" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" [[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 = "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" +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 0.14.3", +] + +[[package]] +name = "matchers" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" +checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" +dependencies = [ + "regex-automata 0.1.10", +] + +[[package]] +name = "matchit" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94" [[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 = "mime" @@ -676,25 +1335,58 @@ 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.8" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" +checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" dependencies = [ "libc", "wasi", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] +name = "mockall" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43766c2b5203b10de348ffe19f7e54564b64f3d6018ff7648d1e2d6d3a0f0a48" +dependencies = [ + "cfg-if", + "downcast", + "fragile", + "lazy_static", + "mockall_derive", + "predicates", + "predicates-tree", +] + +[[package]] +name = "mockall_derive" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af7cbce79ec385a1d4f54baa90a76401eb15d9cab93685f62e7e9f942aa00ae2" +dependencies = [ + "cfg-if", + "proc-macro2", + "quote", + "syn 2.0.53", +] + +[[package]] +name = "multimap" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a" + +[[package]] name = "native-tls" version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -713,33 +1405,78 @@ dependencies = [ ] [[package]] -name = "num-bigint" -version = "0.4.3" +name = "no-std-compat" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b93853da6d84c2e3c7d730d6473e8817692dd89be387eb01b94d7f108ecb5b8c" + +[[package]] +name = "nonzero_ext" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f" +checksum = "38bf9645c8b145698bb0b18a4637dcacbc421ea49bef2317e4fd8065a387cf21" + +[[package]] +name = "nu-ansi-term" +version = "0.46.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" dependencies = [ - "autocfg", + "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", "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-integer" -version = "0.1.45" +version = "0.1.46" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" +dependencies = [ + "num-traits", +] + +[[package]] +name = "num-iter" +version = "0.1.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" +checksum = "d869c01cc0c455284163fd0092f1f93835385ccab5a98a0dcc497b2f8bf055a9" dependencies = [ "autocfg", + "num-integer", "num-traits", ] [[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", ] [[package]] @@ -748,15 +1485,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 = "oauth2" -version = "4.4.1" +version = "4.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09a6e2a2b13a56ebeabba9142f911745be6456163fd6c3d361274ebcd891a80c" +checksum = "c38841cdd844847e3e7c8d29cef9dcfed8877f8f56f9071f77843ecf3baf937f" dependencies = [ "base64 0.13.1", "chrono", @@ -774,34 +1511,38 @@ dependencies = [ [[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", ] [[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 = "openidconnect" -version = "2.5.1" +version = "3.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98dd5b7049bac4fdd2233b8c9767d42c05da8006fdb79cc903258556d2b18009" +checksum = "f47e80a9cfae4462dd29c41e987edd228971d6565553fbc14b8a11e666d91590" dependencies = [ "base64 0.13.1", "chrono", + "dyn-clone", + "ed25519-dalek", + "hmac", "http", - "itertools", + "itertools 0.10.5", "log", - "num-bigint", "oauth2", + "p256", + "p384", "rand", - "ring", + "rsa", "serde", "serde-value", "serde_derive", @@ -809,6 +1550,7 @@ dependencies = [ "serde_path_to_error", "serde_plain", "serde_with", + "sha2", "subtle", "thiserror", "url", @@ -816,11 +1558,11 @@ dependencies = [ [[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", @@ -837,7 +1579,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.53", ] [[package]] @@ -848,9 +1590,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.91" +version = "0.9.101" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "866b5f16f90776b9bb8dc1e1802ac6f0513de3a7a7465867bfbc563dc737faac" +checksum = "dda2b0f344e78efc2facf7d195d098df0dd72151b26ab98da807afc26c198dff" dependencies = [ "cc", "libc", @@ -859,25 +1601,132 @@ dependencies = [ ] [[package]] +name = "opentelemetry" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "900d57987be3f2aeb70d385fff9b27fb74c5723cc9a52d904d4f9c807a0667bf" +dependencies = [ + "futures-core", + "futures-sink", + "js-sys", + "once_cell", + "pin-project-lite", + "thiserror", + "urlencoding", +] + +[[package]] name = "ordered-float" -version = "2.10.0" +version = "2.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7940cf2ca942593318d07fcf2596cdca60a85c9e7fab408a5e21a4f9dcd40d87" +checksum = "68f19d67e5a2795c94e73e0bb1cc1a7edeb2e28efd39e2e1c9b7a40c1108b11c" dependencies = [ "num-traits", ] [[package]] +name = "overload" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" + +[[package]] +name = "p256" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c9863ad85fa8f4460f9c48cb909d38a0d689dba1f6f6988a5e3e0d31071bcd4b" +dependencies = [ + "ecdsa", + "elliptic-curve", + "primeorder", + "sha2", +] + +[[package]] +name = "p384" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70786f51bcc69f6a4c0360e063a4cac5419ef7c5cd5b3c99ad70f3be5ba79209" +dependencies = [ + "ecdsa", + "elliptic-curve", + "primeorder", + "sha2", +] + +[[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 = "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.0" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" + +[[package]] +name = "petgraph" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" +checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" +dependencies = [ + "fixedbitset", + "indexmap 2.2.5", +] + +[[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.53", +] [[package]] name = "pin-project-lite" -version = "0.2.12" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12cc1b0bf1727a77a54b6654e7b5f1af8604923edc8b81885f8ec92f9e3f0a05" +checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" [[package]] name = "pin-utils" @@ -886,10 +1735,49 @@ 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" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" + +[[package]] +name = "platforms" +version = "3.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "626dec3cac7cc0e1577a2ec3fc496277ec2baa084bebad95bb6fdbfae235f84c" + +[[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" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" +checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" [[package]] name = "ppv-lite86" @@ -898,19 +1786,200 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] +name = "predicates" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68b87bfd4605926cdfefc1c3b5f8fe560e3feca9d5552cf68c466d3d8236c7e8" +dependencies = [ + "anstyle", + "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.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a41cf62165e97c7f814d2221421dbb9afcbcdb0a88068e5ea206e19951c2cbb5" +dependencies = [ + "proc-macro2", + "syn 2.0.53", +] + +[[package]] +name = "primeorder" +version = "0.13.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "353e1ca18966c16d9deb1c69278edbc5f194139612772bd9537af60ac231e1e6" +dependencies = [ + "elliptic-curve", +] + +[[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 = "prometheus" +version = "0.13.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "449811d15fbdf5ceb5c1144416066429cf82316e2ec8ce0c1f6f8a02e7bbcf8c" +dependencies = [ + "cfg-if", + "fnv", + "lazy_static", + "memchr", + "parking_lot", + "protobuf", + "thiserror", +] + +[[package]] +name = "prost" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "146c289cda302b98a28d40c8b3b90498d6e526dd24ac2ecea73e4e491685b94a" +dependencies = [ + "bytes", + "prost-derive", +] + +[[package]] +name = "prost-build" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c55e02e35260070b6f716a2423c2ff1c3bb1642ddca6f99e1f26d06268a0e2d2" +dependencies = [ + "bytes", + "heck 0.4.1", + "itertools 0.11.0", + "log", + "multimap", + "once_cell", + "petgraph", + "prettyplease", + "prost", + "prost-types", + "regex", + "syn 2.0.53", + "tempfile", + "which", +] + +[[package]] +name = "prost-derive" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "efb6c9a1dd1def8e2124d17e83a20af56f1570d6c2d2bd9e266ccb768df3840e" +dependencies = [ + "anyhow", + "itertools 0.11.0", + "proc-macro2", + "quote", + "syn 2.0.53", +] + +[[package]] +name = "prost-types" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "193898f59edcf43c26227dcd4c8427f00d99d61e95dcde58dabd49fa291d470e" +dependencies = [ + "prost", +] + +[[package]] +name = "prost-wkt" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4d8ef9c3f0f1dab910d2b7e2c24a8e4322e122eba6d7a1921eeebcebbc046c40" +dependencies = [ + "chrono", + "inventory", + "prost", + "serde", + "serde_derive", + "serde_json", + "typetag", +] + +[[package]] +name = "prost-wkt-build" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b31cae9a54ca84fee1504740a82eebf2479532905e106f63ca0c3bc8d780321" +dependencies = [ + "heck 0.4.1", + "prost", + "prost-build", + "prost-types", + "quote", +] + +[[package]] +name = "prost-wkt-types" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "435be4a8704091b4c5fb1d79799de7f2dbff53af05edf29385237f8cf7ab37ee" +dependencies = [ + "chrono", + "prost", + "prost-build", + "prost-types", + "prost-wkt", + "prost-wkt-build", + "regex", + "serde", + "serde_derive", + "serde_json", +] + +[[package]] +name = "protobuf" +version = "2.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "106dd99e98437432fed6519dedecfade6a06a73bb7b2a1e019fdd2bee5778d94" + +[[package]] +name = "quanta" +version = "0.12.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ca0b7bac0b97248c40bb77288fc52029cf1459c0461ea1b05ee32ccf011de2c" +dependencies = [ + "crossbeam-utils", + "libc", + "once_cell", + "raw-cpuid", + "wasi", + "web-sys", + "winapi", +] + +[[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", ] @@ -946,21 +2015,74 @@ dependencies = [ ] [[package]] +name = "raw-cpuid" +version = "11.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d86a7c4638d42c44551f4791a20e687dbb4c3de1f33c43dd71e355cd429def1" +dependencies = [ + "bitflags 2.5.0", +] + +[[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 = "regex" +version = "1.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata 0.4.6", + "regex-syntax 0.8.2", +] + +[[package]] +name = "regex-automata" +version = "0.1.10" +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" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax 0.8.2", +] + +[[package]] +name = "regex-syntax" +version = "0.6.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" + +[[package]] +name = "regex-syntax" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" + +[[package]] name = "reqwest" -version = "0.11.18" +version = "0.11.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cde824a14b7c14f85caff81225f411faacc04a2013f41670f41443742b1c1c55" +checksum = "78bf93c4af7a8bb7d879d51cebe797356ff10ae8516ace542b5182d9dcac10b2" dependencies = [ - "base64 0.21.2", + "base64 0.21.7", "bytes", "encoding_rs", "futures-core", @@ -978,9 +2100,12 @@ 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", @@ -992,18 +2117,57 @@ dependencies = [ ] [[package]] +name = "rfc6979" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8dd2a808d456c4a54e300a23e9f5a67e122c3024119acbfd73e3bf664491cb2" +dependencies = [ + "hmac", + "subtle", +] + +[[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", + "spin 0.9.8", "untrusted", - "web-sys", - "winapi", + "windows-sys 0.52.0", +] + +[[package]] +name = "ringbuf" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79abed428d1fd2a128201cec72c5f6938e2da607c6f3745f769fabea399d950a" +dependencies = [ + "crossbeam-utils", +] + +[[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]] @@ -1013,31 +2177,155 @@ 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 = "rustfsm" +version = "0.1.0" +source = "git+https://github.com/temporalio/sdk-core?branch=master#4840a9c570fa3388e190e20f01f61065d0b7e965" +dependencies = [ + "rustfsm_procmacro", + "rustfsm_trait", +] + +[[package]] +name = "rustfsm_procmacro" +version = "0.1.0" +source = "git+https://github.com/temporalio/sdk-core?branch=master#4840a9c570fa3388e190e20f01f61065d0b7e965" +dependencies = [ + "derive_more", + "proc-macro2", + "quote", + "rustfsm_trait", + "syn 2.0.53", +] + +[[package]] +name = "rustfsm_trait" +version = "0.1.0" +source = "git+https://github.com/temporalio/sdk-core?branch=master#4840a9c570fa3388e190e20f01f61065d0b7e965" + +[[package]] name = "rustix" -version = "0.38.8" +version = "0.38.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19ed4fa021d81c8392ce04db050a3da9a60299050b7ae1cf482d862b54a7218f" +checksum = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.5.0", "errno", "libc", "linux-raw-sys", - "windows-sys", + "windows-sys 0.52.0", ] [[package]] +name = "rustls" +version = "0.22.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e87c9956bd9807afa1f77e0f7594af32566e830e088a5576d27c5b6f30f49d41" +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 2.1.1", + "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.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-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" +source = "registry+https://github.com/rust-lang/crates.io-index" +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 = "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 = "sec1" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3e97a565f76233a6003f9f5c54be1d9c5bdfa3eccfb189469f11ec4901c47dc" +dependencies = [ + "base16ct", + "der", + "generic-array", + "pkcs8", + "subtle", + "zeroize", ] [[package]] @@ -1064,10 +2352,16 @@ dependencies = [ ] [[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.183" +version = "1.0.197" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32ac8da02677876d532745a130fc9d8e6edfa81a269b107c5b00829b91d8eb3c" +checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" dependencies = [ "serde_derive", ] @@ -1084,20 +2378,20 @@ dependencies = [ [[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.29", + "syn 2.0.53", ] [[package]] name = "serde_json" -version = "1.0.105" +version = "1.0.114" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "693151e1ac27563d6dbcec9dee9fbd5da8539b20fa14ad3752b2e6d363ace360" +checksum = "c5f09b1bd632ef549eaa9f60a1f8de742bdbc698e6cee2095fc84dde5f549ae0" dependencies = [ "itoa", "ryu", @@ -1106,9 +2400,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", @@ -1116,9 +2410,9 @@ dependencies = [ [[package]] name = "serde_plain" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6018081315db179d0ce57b1fe4b62a12a0028c9cf9bbef868c9cf477b3c34ae" +checksum = "9ce1fc6db65a611022b23a0dec6975d63fb80a302cb3388835ff02c097258d50" dependencies = [ "serde", ] @@ -1137,31 +2431,39 @@ dependencies = [ [[package]] name = "serde_with" -version = "1.14.0" +version = "3.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "678b5a069e50bf00ecd22d0cd8ddf7c236f68581b03db652061ed5eb13a312ff" +checksum = "ee80b0e361bbf88fd2f6e242ccd19cfda072cb0faa6ae694ecee08199938569a" dependencies = [ + "base64 0.21.7", + "chrono", + "hex", + "indexmap 1.9.3", + "indexmap 2.2.5", "serde", + "serde_derive", + "serde_json", "serde_with_macros", + "time", ] [[package]] name = "serde_with_macros" -version = "1.5.2" +version = "3.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e182d6ec6f05393cc0e5ed1bf81ad6db3a8feedf8ee515ecdd369809bcce8082" +checksum = "6561dc161a9224638a31d876ccdfefbc1df91d3f3a8342eddb35f055d48c7655" dependencies = [ "darling", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.53", ] [[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", @@ -1169,32 +2471,85 @@ dependencies = [ ] [[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 = "signal-hook-registry" +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", +] + +[[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.8" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" dependencies = [ "autocfg", ] [[package]] -name = "socket2" -version = "0.4.9" +name = "slotmap" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" +checksum = "dbff4acf519f630b3a3ddcfaea6c06b42174d9a44bc70c620e9ed1649d58b82a" dependencies = [ - "libc", - "winapi", + "version_check", +] + +[[package]] +name = "smallvec" +version = "1.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" + +[[package]] +name = "smeeclient" +version = "0.1.0" +dependencies = [ + "cbindgen", + "serde", + "temporal-client", + "temporal-sdk", + "temporal-sdk-core-protos", + "tokio", + "url", + "uuid", ] [[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]] @@ -1204,6 +2559,31 @@ 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 = "spinning_top" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d96d2d1d716fb500937168cc09353ffdc7a012be8475ac7308e1bdf0e3923300" +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 = "strsim" version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1234,9 +2614,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.29" +version = "2.0.53" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c324c494eba9d92503e6f1ef2e6df781e78f6a7705a0202d9801b198807d518a" +checksum = "7383cd0e49fff4b6b90ca5670bfd3e9d6a733b3f90c686605aa7eec8c4996032" dependencies = [ "proc-macro2", "quote", @@ -1244,19 +2624,197 @@ dependencies = [ ] [[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" +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 = "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", "rustix", - "windows-sys", + "windows-sys 0.52.0", +] + +[[package]] +name = "temporal-client" +version = "0.1.0" +source = "git+https://github.com/temporalio/sdk-core?branch=master#4840a9c570fa3388e190e20f01f61065d0b7e965" +dependencies = [ + "anyhow", + "async-trait", + "backoff", + "derive_builder", + "derive_more", + "futures", + "futures-retry", + "http", + "once_cell", + "opentelemetry", + "parking_lot", + "prost-types", + "slotmap", + "temporal-sdk-core-api", + "temporal-sdk-core-protos", + "thiserror", + "tokio", + "tonic", + "tower", + "tracing", + "url", + "uuid", +] + +[[package]] +name = "temporal-sdk" +version = "0.1.0-alpha.1" +source = "git+https://github.com/temporalio/sdk-core?branch=master#4840a9c570fa3388e190e20f01f61065d0b7e965" +dependencies = [ + "anyhow", + "async-trait", + "base64 0.21.7", + "crossbeam-channel", + "derive_more", + "futures", + "once_cell", + "parking_lot", + "prost-wkt-types", + "serde", + "sha2", + "temporal-client", + "temporal-sdk-core", + "temporal-sdk-core-api", + "temporal-sdk-core-protos", + "thiserror", + "tokio", + "tokio-stream", + "tokio-util", + "tonic", + "tracing", +] + +[[package]] +name = "temporal-sdk-core" +version = "0.1.0" +source = "git+https://github.com/temporalio/sdk-core?branch=master#4840a9c570fa3388e190e20f01f61065d0b7e965" +dependencies = [ + "anyhow", + "async-trait", + "base64 0.21.7", + "crossbeam-channel", + "crossbeam-queue", + "dashmap", + "derive_builder", + "derive_more", + "enum-iterator", + "enum_dispatch", + "futures", + "futures-util", + "governor", + "itertools 0.12.1", + "log", + "lru", + "mockall", + "once_cell", + "parking_lot", + "pin-project", + "prometheus", + "prost", + "prost-wkt-types", + "rand", + "ringbuf", + "rustfsm", + "serde", + "serde_json", + "siphasher", + "slotmap", + "temporal-client", + "temporal-sdk-core-api", + "temporal-sdk-core-protos", + "thiserror", + "tokio", + "tokio-stream", + "tokio-util", + "tonic", + "tonic-build", + "tracing", + "tracing-subscriber", + "url", + "uuid", +] + +[[package]] +name = "temporal-sdk-core-api" +version = "0.1.0" +source = "git+https://github.com/temporalio/sdk-core?branch=master#4840a9c570fa3388e190e20f01f61065d0b7e965" +dependencies = [ + "async-trait", + "derive_builder", + "derive_more", + "opentelemetry", + "prost-types", + "serde_json", + "temporal-sdk-core-protos", + "thiserror", + "tonic", + "tracing-core", + "url", +] + +[[package]] +name = "temporal-sdk-core-protos" +version = "0.1.0" +source = "git+https://github.com/temporalio/sdk-core?branch=master#4840a9c570fa3388e190e20f01f61065d0b7e965" +dependencies = [ + "anyhow", + "base64 0.21.7", + "derive_more", + "prost", + "prost-wkt", + "prost-wkt-build", + "prost-wkt-types", + "rand", + "serde", + "serde_json", + "thiserror", + "tonic", + "tonic-build", + "uuid", ] [[package]] +name = "termtree" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76" + +[[package]] name = "textwrap" version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1267,32 +2825,44 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.47" +version = "1.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97a802ec30afc17eee47b2855fc72e0c4cd62be9b4efe6591edde0ec5bd68d8f" +checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.47" +version = "1.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bb623b56e39ab7dcd4b1b98bb6c8f8d907ed255b18de254088016b27a8ee19b" +checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.53", +] + +[[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 = "time" -version = "0.3.25" +version = "0.3.34" 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", @@ -1300,16 +2870,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", ] @@ -1330,18 +2901,42 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.32.0" +version = "1.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17ed6077ed6cd6c74735e21f37eb16dc3935f96878b1fe961074089cc80893f9" +checksum = "61285f6515fa018fb2d1e46eb21223fff441ee8db5d0f1435e8ab4f5cdb80931" 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-io-timeout" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30b74022ada614a1b4834de765f9bb43877f910cc8ce4be40e89042c9223a8bf" +dependencies = [ "pin-project-lite", - "socket2 0.5.3", - "windows-sys", + "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.53", ] [[package]] @@ -1355,10 +2950,32 @@ dependencies = [ ] [[package]] +name = "tokio-rustls" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "775e0c0f0adb3a2f22a00c4745d728b479985fc15ee7ca6a2608388c5569860f" +dependencies = [ + "rustls", + "rustls-pki-types", + "tokio", +] + +[[package]] +name = "tokio-stream" +version = "0.1.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af" +dependencies = [ + "futures-core", + "pin-project-lite", + "tokio", +] + +[[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", @@ -1378,6 +2995,76 @@ dependencies = [ ] [[package]] +name = "tonic" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76c4eb7a4e9ef9d4763600161f12f5070b92a578e1b634db88a6887844c91a13" +dependencies = [ + "async-stream", + "async-trait", + "axum", + "base64 0.21.7", + "bytes", + "h2", + "http", + "http-body", + "hyper", + "hyper-timeout", + "percent-encoding", + "pin-project", + "prost", + "rustls-native-certs", + "rustls-pemfile 2.1.1", + "rustls-pki-types", + "tokio", + "tokio-rustls", + "tokio-stream", + "tower", + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "tonic-build" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be4ef6dd70a610078cb4e338a0f79d06bc759ff1b22d2120c2ff02ae264ba9c2" +dependencies = [ + "prettyplease", + "proc-macro2", + "prost-build", + "quote", + "syn 2.0.53", +] + +[[package]] +name = "tower" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" +dependencies = [ + "futures-core", + "futures-util", + "indexmap 1.9.3", + "pin-project", + "pin-project-lite", + "rand", + "slab", + "tokio", + "tokio-util", + "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" @@ -1385,80 +3072,147 @@ 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", "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.53", +] + +[[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", +] + +[[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", + "parking_lot", + "regex", + "sharded-slab", + "smallvec", + "thread_local", + "tracing", + "tracing-core", + "tracing-log", ] [[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.16.0" +version = "1.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" + +[[package]] +name = "typetag" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "661d18414ec032a49ece2d56eee03636e43c4e8d577047ab334c0ba892e29aaf" +dependencies = [ + "erased-serde", + "inventory", + "once_cell", + "serde", + "typetag-impl", +] + +[[package]] +name = "typetag-impl" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" +checksum = "ac73887f47b9312552aa90ef477927ff014d63d1920ca8037c6c1951eab64bb1" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.53", +] [[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-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.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", @@ -1467,6 +3221,27 @@ dependencies = [ ] [[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" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0" +dependencies = [ + "getrandom", +] + +[[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" @@ -1501,9 +3276,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", @@ -1511,24 +3286,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.29", + "syn 2.0.53", "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", @@ -1538,9 +3313,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", @@ -1548,34 +3323,46 @@ 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.29", + "syn 2.0.53", "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", ] [[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", +] + +[[package]] name = "winapi" version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1598,12 +3385,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]] @@ -1612,7 +3399,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]] @@ -1621,13 +3417,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]] @@ -1637,55 +3448,118 @@ 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 = "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 = "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.53", ] [[package]] name = "zeroidc" version = "0.1.0" dependencies = [ - "base64 0.21.2", + "base64 0.21.7", "bytes", "cbindgen", "jwt", @@ -1697,3 +3571,9 @@ dependencies = [ "tokio", "url", ] + +[[package]] +name = "zeroize" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" diff --git a/pkgs/tools/networking/zerotierone/default.nix b/pkgs/tools/networking/zerotierone/default.nix index 1bf10ce2c4080..f9415055a537d 100644 --- a/pkgs/tools/networking/zerotierone/default.nix +++ b/pkgs/tools/networking/zerotierone/default.nix @@ -14,13 +14,13 @@ let pname = "zerotierone"; - version = "1.12.2"; + version = "1.14.0"; src = fetchFromGitHub { owner = "zerotier"; repo = "ZeroTierOne"; rev = version; - sha256 = "sha256-p0zrYgbHTLefj5GTrMnYLytCXZ/nRuqTL+6dEeC+uVw="; + sha256 = "sha256-YWcqALUB3ZEukL4er2FKcyNdEbuaf//QU5hRbKAfxDA="; }; in stdenv.mkDerivation { @@ -30,13 +30,14 @@ in stdenv.mkDerivation { lockFile = ./Cargo.lock; outputHashes = { "jwt-0.16.0" = "sha256-P5aJnNlcLe9sBtXZzfqHdRvxNfm6DPBcfcKOVeLZxcM="; + "rustfsm-0.1.0" = "sha256-q7J9QgN67iuoNhQC8SDVzUkjCNRXGiNCkE8OsQc5+oI="; }; }; postPatch = "cp ${./Cargo.lock} Cargo.lock"; preConfigure = '' - cmp ./Cargo.lock ./zeroidc/Cargo.lock || { - echo 1>&2 "Please make sure that the derivation's Cargo.lock is identical to ./zeroidc/Cargo.lock!" + cmp ./Cargo.lock ./rustybits/Cargo.lock || { + echo 1>&2 "Please make sure that the derivation's Cargo.lock is identical to ./rustybits/Cargo.lock!" exit 1 } diff --git a/pkgs/tools/networking/zerotierone/update.sh b/pkgs/tools/networking/zerotierone/update.sh index 24b0d91d37cd3..7df1f08d32537 100755 --- a/pkgs/tools/networking/zerotierone/update.sh +++ b/pkgs/tools/networking/zerotierone/update.sh @@ -3,5 +3,5 @@ version=$(curl --silent "https://api.github.com/repos/zerotier/ZeroTierOne/releases" | jq '.[0].tag_name' --raw-output) -curl --silent "https://raw.githubusercontent.com/zerotier/ZeroTierOne/$version/zeroidc/Cargo.lock" > "$(dirname "$0")/Cargo.lock" +curl --silent "https://raw.githubusercontent.com/zerotier/ZeroTierOne/$version/rustybits/Cargo.lock" > "$(dirname "$0")/Cargo.lock" update-source-version zerotierone "$version" diff --git a/pkgs/tools/package-management/nix-eval-jobs/2.19.nix b/pkgs/tools/package-management/nix-eval-jobs/2.19.nix new file mode 100644 index 0000000000000..bf2d48e4adfb1 --- /dev/null +++ b/pkgs/tools/package-management/nix-eval-jobs/2.19.nix @@ -0,0 +1,47 @@ +{ lib +, boost +, cmake +, fetchFromGitHub +, meson +, ninja +, nix +, nlohmann_json +, pkg-config +, stdenv +}: +stdenv.mkDerivation rec { + pname = "nix-eval-jobs"; + version = "2.19.4"; + src = fetchFromGitHub { + owner = "nix-community"; + repo = pname; + rev = "v${version}"; + hash = "sha256-97ZqhTMqnAr1rzEy96faceWzFyWexnYbH1aTfc1y0JE="; + }; + buildInputs = [ + boost + nix + nlohmann_json + ]; + nativeBuildInputs = [ + meson + ninja + pkg-config + # nlohmann_json can be only discovered via cmake files + cmake + ]; + + # Since this package is intimately tied to a specific Nix release, we + # propagate the Nix used for building it to make it easier for users + # downstream to reference it. + passthru = { inherit nix; }; + + meta = { + description = "Hydra's builtin hydra-eval-jobs as a standalone"; + homepage = "https://github.com/nix-community/nix-eval-jobs"; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ adisbladis mic92 ]; + platforms = lib.platforms.unix; + mainProgram = "nix-eval-jobs"; + }; +} diff --git a/pkgs/tools/package-management/nix-eval-jobs/default.nix b/pkgs/tools/package-management/nix-eval-jobs/default.nix index 37194739e5d18..15a095f6c3b13 100644 --- a/pkgs/tools/package-management/nix-eval-jobs/default.nix +++ b/pkgs/tools/package-management/nix-eval-jobs/default.nix @@ -11,12 +11,12 @@ }: stdenv.mkDerivation rec { pname = "nix-eval-jobs"; - version = "2.21.0"; + version = "2.22.0"; src = fetchFromGitHub { owner = "nix-community"; repo = pname; rev = "v${version}"; - hash = "sha256-StJq7Zy+/iVBUAKFzhHWlsirFucZ3gNtzXhAYXAsNnw="; + hash = "sha256-Foi9FUuwKBUVExR3uEJEGsNRCGkkoNDj0yEhASanGCM="; }; buildInputs = [ boost diff --git a/pkgs/tools/security/arti/default.nix b/pkgs/tools/security/arti/default.nix index e410a86855560..0ad27f3d08ab2 100644 --- a/pkgs/tools/security/arti/default.nix +++ b/pkgs/tools/security/arti/default.nix @@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec { pname = "arti"; - version = "1.2.1"; + version = "1.2.2"; src = fetchFromGitLab { domain = "gitlab.torproject.org"; @@ -18,10 +18,10 @@ rustPlatform.buildRustPackage rec { owner = "core"; repo = "arti"; rev = "arti-v${version}"; - hash = "sha256-Ps1AIvL6hOnSYtvi4wbgJQiuv2eb1XIEPul/WypM9bo="; + hash = "sha256-DicOkh2yv6qbxf1x4fAZq34qtuD/T4twn8JMnI9XGCI="; }; - cargoHash = "sha256-2u/8nn/9tz+hlNDz6I/g2cMPWXZSMVNV7FPsKFP8jqo="; + cargoHash = "sha256-ICJMcFTIHFLxB5XJeMRi1M6e9p0nKwT3vbqAZT22vmU="; nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ]; diff --git a/pkgs/tools/security/ecdsatool/ctype-header-c99-implicit-function-declaration.patch b/pkgs/tools/security/ecdsatool/ctype-header-c99-implicit-function-declaration.patch new file mode 100644 index 0000000000000..1bbe576e452ed --- /dev/null +++ b/pkgs/tools/security/ecdsatool/ctype-header-c99-implicit-function-declaration.patch @@ -0,0 +1,12 @@ +diff --git a/libecdsaauth/base64.c b/libecdsaauth/base64.c +index 0f9b7a3..84df22a 100644 +--- a/libecdsaauth/base64.c ++++ b/libecdsaauth/base64.c +@@ -45,6 +45,7 @@ + #include <string.h> + #include <unistd.h> + #include <assert.h> ++#include <ctype.h> + + static const char Base64[] = + "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; diff --git a/pkgs/tools/security/ecdsatool/default.nix b/pkgs/tools/security/ecdsatool/default.nix index aa55facfd8e04..439ffac563c7a 100644 --- a/pkgs/tools/security/ecdsatool/default.nix +++ b/pkgs/tools/security/ecdsatool/default.nix @@ -16,6 +16,11 @@ stdenv.mkDerivation { ./configure --prefix=$out ''; + patches = [ + ./ctype-header-c99-implicit-function-declaration.patch + ./openssl-header-c99-implicit-function-declaration.patch + ]; + nativeBuildInputs = with pkgs; [openssl autoconf automake]; buildInputs = with pkgs; [libuecc]; diff --git a/pkgs/tools/security/ecdsatool/openssl-header-c99-implicit-function-declaration.patch b/pkgs/tools/security/ecdsatool/openssl-header-c99-implicit-function-declaration.patch new file mode 100644 index 0000000000000..1821743c18038 --- /dev/null +++ b/pkgs/tools/security/ecdsatool/openssl-header-c99-implicit-function-declaration.patch @@ -0,0 +1,33 @@ +diff --git a/libecdsaauth/keypair.c b/libecdsaauth/keypair.c +index 5e098c5..b5dd21e 100644 +--- a/libecdsaauth/keypair.c ++++ b/libecdsaauth/keypair.c +@@ -22,6 +22,7 @@ + + #include <string.h> + #include <stdlib.h> ++#include <openssl/pem.h> + + static inline libecdsaauth_key_t *libecdsaauth_key_alloc(void) + { +diff --git a/tool/main.c b/tool/main.c +index 23d19a3..f88016c 100644 +--- a/tool/main.c ++++ b/tool/main.c +@@ -21,6 +21,7 @@ + #include <stdio.h> + #include <stdlib.h> + #include <string.h> ++#include <openssl/pem.h> + + #include "libecdsaauth/keypair.h" + #include "libecdsaauth/op.h" +@@ -41,7 +42,7 @@ static int tool_keygen(int argc, const char *argv[]) + key = libecdsaauth_key_new(); + + pubout = fopen(argv[1], "w"); +- PEM_write_ECPrivateKey(pubout, key->eckey, NULL, NULL, 0, NULL); ++ PEM_write_ECPrivateKey(pubout, key->eckey, NULL, NULL, 0, NULL, NULL); + fclose(pubout); + + pubkey = libecdsaauth_key_public_key_base64(key); diff --git a/pkgs/tools/security/fscan/default.nix b/pkgs/tools/security/fscan/default.nix index 00ce9d8ec78e3..29fbf2453ee43 100644 --- a/pkgs/tools/security/fscan/default.nix +++ b/pkgs/tools/security/fscan/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "fscan"; - version = "1.8.3-build3"; + version = "1.8.4"; src = fetchFromGitHub { owner = "shadow1ng"; repo = "fscan"; rev = version; - hash = "sha256-GtOCd8JaR6tx8hoB+P9QXrEnN7Wvmv7jddhc2/8hjvQ="; + hash = "sha256-5uFSvEkTBy0veMdeeg9BmSqu+qSqCwuozK0J3kerAdE="; }; - vendorHash = "sha256-hvb2IfypwYauF3ubE36u0bTU+l/FWP/CZt6dFd9zc6s="; + vendorHash = "sha256-FFYqvGEFe7sUEb4G3ApQOuYoiDXeA54P7spmKfRiEF0="; meta = with lib; { description = "An intranet comprehensive scanning tool"; diff --git a/pkgs/tools/security/metasploit/Gemfile b/pkgs/tools/security/metasploit/Gemfile index b6526540c77bd..03770b1cc6609 100644 --- a/pkgs/tools/security/metasploit/Gemfile +++ b/pkgs/tools/security/metasploit/Gemfile @@ -1,4 +1,4 @@ # frozen_string_literal: true source "https://rubygems.org" -gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.4.7" +gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.4.8" diff --git a/pkgs/tools/security/metasploit/Gemfile.lock b/pkgs/tools/security/metasploit/Gemfile.lock index 9e15c13be2d2c..0cbc2a918ad4e 100644 --- a/pkgs/tools/security/metasploit/Gemfile.lock +++ b/pkgs/tools/security/metasploit/Gemfile.lock @@ -1,9 +1,9 @@ GIT remote: https://github.com/rapid7/metasploit-framework - revision: 2f47cc94d99413b39b5963e94355f0d1ae012cb5 - ref: refs/tags/6.4.7 + revision: e9f897a525576857abd73c96ac64beb0094ad547 + ref: refs/tags/6.4.8 specs: - metasploit-framework (6.4.7) + metasploit-framework (6.4.8) actionpack (~> 7.0.0) activerecord (~> 7.0.0) activesupport (~> 7.0.0) diff --git a/pkgs/tools/security/metasploit/default.nix b/pkgs/tools/security/metasploit/default.nix index 85b471c8e8c97..e9600b703bf87 100644 --- a/pkgs/tools/security/metasploit/default.nix +++ b/pkgs/tools/security/metasploit/default.nix @@ -15,13 +15,13 @@ let }; in stdenv.mkDerivation rec { pname = "metasploit-framework"; - version = "6.4.7"; + version = "6.4.8"; src = fetchFromGitHub { owner = "rapid7"; repo = "metasploit-framework"; rev = "refs/tags/${version}"; - hash = "sha256-HqISVgemx7heOxTfjjEf4si3wQle4pHGi5AW7nroPoc="; + hash = "sha256-a5Igd8i5K9qt6r5dHuzRMWLrXZn95PJtYnW4A4HcUNE="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/security/metasploit/gemset.nix b/pkgs/tools/security/metasploit/gemset.nix index 7d3b53263be24..ee104260ca7bf 100644 --- a/pkgs/tools/security/metasploit/gemset.nix +++ b/pkgs/tools/security/metasploit/gemset.nix @@ -674,12 +674,12 @@ platforms = []; source = { fetchSubmodules = false; - rev = "2f47cc94d99413b39b5963e94355f0d1ae012cb5"; - sha256 = "11ryx1xfw5lhig393qjy170vgj723wqqxpql7dgbiix60xb158hy"; + rev = "e9f897a525576857abd73c96ac64beb0094ad547"; + sha256 = "1lahvj0h7f3mc9nz5r7xk5fynqiis7n1wpdyxanxlaxrr1vj14kb"; type = "git"; url = "https://github.com/rapid7/metasploit-framework"; }; - version = "6.4.7"; + version = "6.4.8"; }; metasploit-model = { groups = ["default"]; diff --git a/pkgs/tools/security/notation/default.nix b/pkgs/tools/security/notation/default.nix index 07c9ef4997172..f9318296060f5 100644 --- a/pkgs/tools/security/notation/default.nix +++ b/pkgs/tools/security/notation/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub, testers, notation }: +{ lib, buildGoModule, fetchFromGitHub, installShellFiles, testers, notation }: buildGoModule rec { pname = "notation"; @@ -13,6 +13,10 @@ buildGoModule rec { vendorHash = "sha256-USkufc1dG4eyRfRJHSX4mVZHnvOc5onHenF98Aedac4="; + nativeBuildInputs = [ + installShellFiles + ]; + # This is a Go sub-module and cannot be built directly (e2e tests). excludedPackages = [ "./test" ]; @@ -23,6 +27,13 @@ buildGoModule rec { "-X github.com/notaryproject/notation/internal/version.BuildMetadata=" ]; + postInstall = '' + installShellCompletion --cmd notation \ + --bash <($out/bin/notation completion bash) \ + --fish <($out/bin/notation completion fish) \ + --zsh <($out/bin/notation completion zsh) + ''; + passthru.tests.version = testers.testVersion { package = notation; command = "notation version"; diff --git a/pkgs/tools/security/nuclei/default.nix b/pkgs/tools/security/nuclei/default.nix index e81a92b3f1e03..259680693dac5 100644 --- a/pkgs/tools/security/nuclei/default.nix +++ b/pkgs/tools/security/nuclei/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "nuclei"; - version = "3.2.6"; + version = "3.2.7"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "nuclei"; rev = "refs/tags/v${version}"; - hash = "sha256-lbN82tzH2sXRM8aOjPvFI5J18k4OdYpurLCR8TjVyrw="; + hash = "sha256-sXrDmtuKfFeYAJnxIZGQiYiAjx40YQLfnMQ8YUCkZ7s="; }; - vendorHash = "sha256-F7k8XejAPlrv4RYCvVWxX1OlDXOGS/ow8wHXyuaCkq0="; + vendorHash = "sha256-PXa8Fd7LE6uebpep1/HV2EuJdzj8cxeiZ4DYALIoh2A="; subPackages = [ "cmd/nuclei/" ]; diff --git a/pkgs/tools/security/rbw/default.nix b/pkgs/tools/security/rbw/default.nix index e6d54c235940b..177ec8d35e416 100644 --- a/pkgs/tools/security/rbw/default.nix +++ b/pkgs/tools/security/rbw/default.nix @@ -25,14 +25,14 @@ rustPlatform.buildRustPackage rec { pname = "rbw"; - version = "1.10.0"; + version = "1.10.1"; src = fetchzip { url = "https://git.tozt.net/rbw/snapshot/rbw-${version}.tar.gz"; - hash = "sha256-uJ1QLEaab/Vb5GiAmbwjve3Y/3SM2XbNTRTvl2vPDYc="; + hash = "sha256-56QlWVEx6bWxQz3u/s9+bXsGVPSDaDEdFNj4nVw0SLY="; }; - cargoHash = "sha256-tDgkANbUmNLe3us+05gD9IS0f+RTQBXTGvuz2cr2zYY="; + cargoHash = "sha256-mQrplqu9yiCTwsiChGPjfLDx3dZTofmrp+ouDFuwYO8="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/tools/system/stress-ng/default.nix b/pkgs/tools/system/stress-ng/default.nix index 0e87cbffd0504..6ff1a8931b6ea 100644 --- a/pkgs/tools/system/stress-ng/default.nix +++ b/pkgs/tools/system/stress-ng/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "stress-ng"; - version = "0.17.07"; + version = "0.17.08"; src = fetchFromGitHub { owner = "ColinIanKing"; repo = pname; rev = "V${version}"; - hash = "sha256-eXDCzyZ/YeumHjuLpr6stkWkApwfi8ExDx3uZTVa/cs="; + hash = "sha256-ipiR7vLNF0+y0YtXZC0qpp361lfpXzlIp3eLUbn0oXc="; }; postPatch = '' diff --git a/pkgs/tools/typesetting/tex/texpresso/default.nix b/pkgs/tools/typesetting/tex/texpresso/default.nix index 4b53c6d6def77..52e8be777c09e 100644 --- a/pkgs/tools/typesetting/tex/texpresso/default.nix +++ b/pkgs/tools/typesetting/tex/texpresso/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { pname = "texpresso"; - version = "0-unstable-2024-04-30"; + version = "0-unstable-2024-05-09"; nativeBuildInputs = [ makeWrapper @@ -35,8 +35,8 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "let-def"; repo = "texpresso"; - rev = "a5241c3ac27eb5eda01bd58b6370982a64320106"; - hash = "sha256-2RvbIFfYQQSsrXJ72q5LWyaCLCZvThTi7YuiOaJR9mE="; + rev = "8b6cfcd10c03596bc3645ac8425a48b105d8650d"; + hash = "sha256-uLGanGEUGzxIYFbU3U8LLV3bpn/IN9XltvWCmwSlD7E="; }; buildFlags = [ "texpresso" ]; diff --git a/pkgs/tools/virtualization/govc/default.nix b/pkgs/tools/virtualization/govc/default.nix index f3d233e7d49b4..4dc260d7aa525 100644 --- a/pkgs/tools/virtualization/govc/default.nix +++ b/pkgs/tools/virtualization/govc/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "govc"; - version = "0.37.1"; + version = "0.37.2"; subPackages = [ "govc" ]; @@ -10,7 +10,7 @@ buildGoModule rec { rev = "v${version}"; owner = "vmware"; repo = "govmomi"; - sha256 = "sha256-lErMWVr0UWR2Hc6fYZiauLz6kAZY/uGPNjm6oJGBAuw="; + sha256 = "sha256-9gsakFUmeOgWJGmhYtBcdjaEsF5oE3ytoHgwASOciq0="; }; vendorHash = "sha256-1EAQMYaTEtfAiu7+UTkC7QZwSWC1Ihwj9leTd90T0ZU="; diff --git a/pkgs/tools/wayland/aw-watcher-window-wayland/Cargo.lock b/pkgs/tools/wayland/aw-watcher-window-wayland/Cargo.lock index b1cc23695b307..ffdeb1c90618b 100644 --- a/pkgs/tools/wayland/aw-watcher-window-wayland/Cargo.lock +++ b/pkgs/tools/wayland/aw-watcher-window-wayland/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/pkgs/tools/wayland/aw-watcher-window-wayland/default.nix b/pkgs/tools/wayland/aw-watcher-window-wayland/default.nix index 6ffaf29a77d31..5c51ff25d1efd 100644 --- a/pkgs/tools/wayland/aw-watcher-window-wayland/default.nix +++ b/pkgs/tools/wayland/aw-watcher-window-wayland/default.nix @@ -16,6 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-xl9+k6xJp5/t1QPOYfnBLyYprhhrzjzByDKkT3dtVVQ="; }; + cargoPatches = [ ./rustc-serialize-fix.patch ]; + cargoLock = { lockFile = ./Cargo.lock; outputHashes = { @@ -36,5 +38,6 @@ rustPlatform.buildRustPackage rec { license = licenses.mpl20; maintainers = with maintainers; [ esau79p ]; mainProgram = "aw-watcher-window-wayland"; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/wayland/aw-watcher-window-wayland/rustc-serialize-fix.patch b/pkgs/tools/wayland/aw-watcher-window-wayland/rustc-serialize-fix.patch new file mode 100644 index 0000000000000..8d0327e8a4578 --- /dev/null +++ b/pkgs/tools/wayland/aw-watcher-window-wayland/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/pkgs/tools/wayland/wlsunset/default.nix b/pkgs/tools/wayland/wlsunset/default.nix index df0f52fdf79d7..72edfb9c6f487 100644 --- a/pkgs/tools/wayland/wlsunset/default.nix +++ b/pkgs/tools/wayland/wlsunset/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "wlsunset"; - version = "0.3.0"; + version = "0.4.0"; src = fetchFromSourcehut { owner = "~kennylevinsen"; repo = pname; rev = version; - sha256 = "sha256-jGYPWaRUqDL4htdAOA9CAQfoHLBPvK7O9vAzcE81f/E="; + sha256 = "sha256-U/yROKkU9pOBLIIIsmkltF64tt5ZR97EAxxGgrFYwNg="; }; strictDeps = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8fd79f4741b38..8f4e2cba31d53 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -193,7 +193,7 @@ with pkgs; pythonInterpreter = "${python3.withPackages (ps: [ ps.pyelftools ])}/bin/python"; autoPatchelfScript = ../build-support/setup-hooks/auto-patchelf.py; }; - meta.platforms = lib.platforms.linux; + meta.platforms = lib.platforms.linux ++ lib.platforms.freebsd; } ../build-support/setup-hooks/auto-patchelf.sh; tomato-c = callPackage ../applications/misc/tomato-c { }; @@ -540,8 +540,6 @@ with pkgs; coolercontrol = recurseIntoAttrs (callPackage ../applications/system/coolercontrol { }); - coost = callPackage ../development/libraries/coost { }; - confetty = callPackage ../applications/misc/confetty { }; confy = callPackage ../applications/misc/confy { }; @@ -4487,10 +4485,6 @@ with pkgs; ''; }); - caddy = callPackage ../servers/caddy { }; - - xcaddy = callPackage ../servers/caddy/xcaddy { }; - traefik = callPackage ../servers/traefik { }; traefik-certs-dumper = callPackage ../tools/misc/traefik-certs-dumper { }; @@ -5548,10 +5542,7 @@ with pkgs; hypr = callPackage ../applications/window-managers/hyprwm/hypr { cairo = cairo.override { xcbSupport = true; }; }; - hyprland = callPackage ../applications/window-managers/hyprwm/hyprland { - wlroots-hyprland = callPackage ../applications/window-managers/hyprwm/hyprland/wlroots.nix { }; - udis86-hyprland = callPackage ../applications/window-managers/hyprwm/hyprland/udis86.nix { }; - }; + hyprland = callPackage ../applications/window-managers/hyprwm/hyprland { }; hyprland-autoname-workspaces = callPackage ../applications/misc/hyprland-autoname-workspaces { }; @@ -5661,7 +5652,7 @@ with pkgs; klipper = callPackage ../servers/klipper { }; - klipper-firmware = callPackage ../servers/klipper/klipper-firmware.nix { gcc-arm-embedded = gcc-arm-embedded-11; }; + klipper-firmware = callPackage ../servers/klipper/klipper-firmware.nix { gcc-arm-embedded = gcc-arm-embedded-13; }; klipper-flash = callPackage ../servers/klipper/klipper-flash.nix { }; @@ -7828,7 +7819,7 @@ with pkgs; enscript = callPackage ../tools/text/enscript { }; - ensemble-chorus = callPackage ../applications/audio/ensemble-chorus { stdenv = gcc8Stdenv; }; + ensemble-chorus = callPackage ../applications/audio/ensemble-chorus { }; entr = callPackage ../tools/misc/entr { }; @@ -8104,8 +8095,6 @@ with pkgs; flowblade = callPackage ../applications/video/flowblade { }; - fontfor = callPackage ../tools/misc/fontfor { }; - fontforge = lowPrio (callPackage ../tools/misc/fontforge { inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; python = python3; @@ -12945,8 +12934,6 @@ with pkgs; shout = nodePackages.shout; - showmethekey = callPackage ../applications/video/showmethekey { }; - shrikhand = callPackage ../data/fonts/shrikhand { }; shunit2 = callPackage ../tools/misc/shunit2 { }; @@ -16329,7 +16316,7 @@ with pkgs; # assumption is that or any later version is good. choose = platform: /**/ if platform.isDarwin then 16 - else if platform.isFreeBSD then 12 + else if platform.isFreeBSD then 16 else if platform.isAndroid then 12 else if platform.isLinux then 17 else if platform.isWasm then 16 @@ -16734,7 +16721,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; cargo-fuzz = callPackage ../development/tools/rust/cargo-fuzz { }; - cargo-geiger = callPackage ../development/tools/rust/cargo-geiger { }; cargo-hf2 = callPackage ../development/tools/rust/cargo-hf2 { inherit (darwin.apple_sdk.frameworks) AppKit; @@ -18560,8 +18546,6 @@ with pkgs; sigrok-firmware-fx2lafw = callPackage ../development/tools/sigrok-firmware-fx2lafw { }; - cli11 = callPackage ../development/tools/misc/cli11 { }; - datree = callPackage ../development/tools/datree { }; detekt = callPackage ../development/tools/detekt { }; @@ -20571,8 +20555,6 @@ with pkgs; directfb = callPackage ../development/libraries/directfb { }; - discord-gamesdk = callPackage ../development/libraries/discord-gamesdk { }; - discord-rpc = callPackage ../development/libraries/discord-rpc { inherit (darwin.apple_sdk.frameworks) AppKit; }; @@ -22544,7 +22526,7 @@ with pkgs; # We also provide `libiconvReal`, which will always be a standalone libiconv, # just in case you want it regardless of platform. libiconv = - if lib.elem stdenv.hostPlatform.libc [ "glibc" "musl" "nblibc" "wasilibc" ] + if lib.elem stdenv.hostPlatform.libc [ "glibc" "musl" "nblibc" "wasilibc" "fblibc" ] then libcIconv (if stdenv.hostPlatform != stdenv.buildPlatform then libcCross else stdenv.cc.libc) @@ -31457,8 +31439,6 @@ with pkgs; googleearth-pro = libsForQt5.callPackage ../applications/misc/googleearth-pro { }; - google-chrome = callPackage ../applications/networking/browsers/google-chrome { }; - go-graft = callPackage ../applications/networking/go-graft { }; gostatic = callPackage ../applications/misc/gostatic { }; @@ -35037,8 +35017,6 @@ with pkgs; tremc = callPackage ../applications/networking/p2p/tremc { }; - tribler = callPackage ../applications/networking/p2p/tribler { }; - trillian-im = callPackage ../applications/networking/instant-messengers/trillian-im { }; trojita = libsForQt5.callPackage ../applications/networking/mailreaders/trojita { }; @@ -39723,9 +39701,14 @@ with pkgs; dnadd = callPackage ../tools/nix/dnadd { }; - nix-eval-jobs = callPackage ../tools/package-management/nix-eval-jobs { - nix = nixVersions.nix_2_21; - }; + nix-eval-jobs = if stdenv.isDarwin then + callPackage ../tools/package-management/nix-eval-jobs/2.19.nix { + nix = nixVersions.nix_2_19; + } + else + callPackage ../tools/package-management/nix-eval-jobs { + nix = nixVersions.nix_2_22; + }; nix-doc = callPackage ../tools/package-management/nix-doc { }; @@ -40421,6 +40404,15 @@ with pkgs; winePackagesFor = wineBuild: lib.makeExtensible (self: with self; { callPackage = newScope self; + stdenv = + if pkgs.stdenv.isDarwin then + # Match upstream, which builds with the latest SDK and a 10.7 deployment target. + overrideSDK pkgs.stdenv { + darwinMinVersion = "10.7"; + darwinSdkVersion = "11.0"; + } + else + pkgs.stdenv; inherit wineBuild; @@ -40954,8 +40946,6 @@ with pkgs; gpio-utils = callPackage ../os-specific/linux/kernel/gpio-utils.nix { }; - navidrome = callPackage ../servers/misc/navidrome { }; - zalgo = callPackage ../tools/misc/zalgo { }; inherit (callPackage ../applications/misc/zettlr { }) zettlr; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 940a7ef8b771c..6e544c12d213a 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -278,6 +278,7 @@ mapAliases ({ mailman-hyperkitty = throw "Please use pkgs.mailmanPackages.mailman-hyperkitty"; # added 2022-04-29 mailman-web = throw "Please use pkgs.mailman-web"; # added 2022-04-29 manticore = throw "manticore has been removed because its dependency wasm no longer builds and is unmaintained"; # added 2023-05-20 + marshmallow-enum = throw "marshmallow-enum has been removed because it was archived in 2022 and had no maintainer"; # added 2024-05-10 markerlib = throw "markerlib has been removed because it's abandoned since 2013"; # added 2023-05-19 memory_profiler = memory-profiler; # added 2023-10-09 mir_eval = mir-eval; # added 2024-01-07 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 659db6171a5c1..80e540400ada1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1515,6 +1515,8 @@ self: super: with self; { bimmer-connected = callPackage ../development/python-modules/bimmer-connected { }; + binance-connector = callPackage ../development/python-modules/binance-connector { }; + binary = callPackage ../development/python-modules/binary { }; binary2strings = callPackage ../development/python-modules/binary2strings { }; @@ -6964,6 +6966,8 @@ self: super: with self; { lnkparse3 = callPackage ../development/python-modules/lnkparse3 { }; + loadcredential = callPackage ../development/python-modules/loadcredential { }; + loca = callPackage ../development/python-modules/loca { }; localimport = callPackage ../development/python-modules/localimport { }; @@ -7202,8 +7206,6 @@ self: super: with self; { marshmallow-dataclass = callPackage ../development/python-modules/marshmallow-dataclass { }; - marshmallow-enum = callPackage ../development/python-modules/marshmallow-enum { }; - marshmallow-oneofschema = callPackage ../development/python-modules/marshmallow-oneofschema { }; marshmallow-polyfield = callPackage ../development/python-modules/marshmallow-polyfield { }; @@ -9889,6 +9891,8 @@ self: super: with self; { ppdeep = callPackage ../development/python-modules/ppdeep { }; + private-gpt = callPackage ../development/python-modules/private-gpt { }; + prodict = callPackage ../development/python-modules/prodict { }; prometheus-pandas = callPackage ../development/python-modules/prometheus-pandas { }; @@ -9915,6 +9919,8 @@ self: super: with self; { pycketcasts = callPackage ../development/python-modules/pycketcasts { }; + pycomm3 = callPackage ../development/python-modules/pycomm3 { }; + pycomposefile = callPackage ../development/python-modules/pycomposefile { }; pycontrol4 = callPackage ../development/python-modules/pycontrol4 { }; @@ -15183,6 +15189,8 @@ self: super: with self; { tinysegmenter = callPackage ../development/python-modules/tinysegmenter { }; + tinytuya = callPackage ../development/python-modules/tinytuya { }; + tissue = callPackage ../development/python-modules/tissue { }; titlecase = callPackage ../development/python-modules/titlecase { }; diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix index 3b84026b46963..e8d4cd4a47245 100644 --- a/pkgs/top-level/stage.nix +++ b/pkgs/top-level/stage.nix @@ -57,9 +57,7 @@ in , # Non-GNU/Linux OSes are currently "impure" platforms, with their libc # outside of the store. Thus, GCC, GFortran, & co. must always look for files # in standard system directories (/usr/include, etc.) - noSysDirs ? stdenv.buildPlatform.system != "x86_64-freebsd" - && stdenv.buildPlatform.system != "i686-freebsd" - && stdenv.buildPlatform.system != "x86_64-solaris" + noSysDirs ? stdenv.buildPlatform.system != "x86_64-solaris" && stdenv.buildPlatform.system != "x86_64-kfreebsd-gnu" , # The configuration attribute set |